Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/muyu/system/service/impl/BuyServiceImpl.javamaster
commit
6c330c126e
|
@ -44,32 +44,30 @@ public class BuyServiceImpl extends ServiceImpl<BuyMapper, Connector> implements
|
|||
Integer i = buyMapper.doBuyInterface(connectorUser);
|
||||
if (i>0){
|
||||
user.setUserBalance(user.getUserBalance()-connectorUser.getConnectorFrequency()*connectorUser.getConnectorPrice());
|
||||
//购买减余额
|
||||
buyMapper.buyPrice(user);
|
||||
buyMapper.doBuyInterface(connectorUser);
|
||||
ConnectorLog connectorLog = new ConnectorLog();
|
||||
connectorLog.setDataName(connectorUser.getConnectorName());
|
||||
connectorLog.setAmount(connectorUser.getConnectorPrice());
|
||||
connectorLog.setAmount((connectorUser.getConnectorFrequency() * connectorUser.getConnectorPrice()));
|
||||
// 插入购买记录
|
||||
buyMapper.insertPurchaseRecord(connectorLog);
|
||||
return Result.success(i,"购买成功");
|
||||
}
|
||||
// ConnectorUser connectorUser1 = buyMapper.selectConnectorUser(connectorUser);
|
||||
// if (connectorUser1==null){
|
||||
// //添加
|
||||
//// Integer i1 = buyMapper.addConnectorUser(connectorUser);
|
||||
//// if (i1>0){
|
||||
// user.setUserBalance(user.getUserBalance()-connectorUser.getConnectorFrequency()*connectorUser.getConnectorPrice());
|
||||
// buyMapper.buyPrice(user);
|
||||
// buyMapper.doBuyInterface(connectorUser);
|
||||
// ConnectorLog connectorLog = new ConnectorLog();
|
||||
// connectorLog.setDataName(connectorUser.getConnectorName());
|
||||
// connectorLog.setAmount(connectorUser.getConnectorPrice());
|
||||
// // 插入购买记录
|
||||
// buyMapper.insertPurchaseRecord(connectorLog);
|
||||
// return Result.success(i,"购买成功");
|
||||
//// }
|
||||
// }
|
||||
ConnectorUser connectorUser1 = buyMapper.selectConnectorUser(connectorUser);
|
||||
if (connectorUser1==null){
|
||||
Integer i1 = buyMapper.addConnectorUser(connectorUser);
|
||||
if (i1>0){
|
||||
user.setUserBalance(user.getUserBalance()-connectorUser.getConnectorFrequency()*connectorUser.getConnectorPrice());
|
||||
buyMapper.buyPrice(user);
|
||||
buyMapper.doBuyInterface(connectorUser);
|
||||
ConnectorLog connectorLog = new ConnectorLog();
|
||||
connectorLog.setDataName(connectorUser.getConnectorName());
|
||||
connectorLog.setAmount((connectorUser.getConnectorFrequency() * connectorUser.getConnectorPrice()));
|
||||
// 插入购买记录
|
||||
buyMapper.insertPurchaseRecord(connectorLog);
|
||||
return Result.success(i,"购买成功");
|
||||
}
|
||||
}
|
||||
return Result.error("购买失败");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue