yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:74e696429e74318f187c6f9aab72bf726dd0c87f
Branches Tags
yangjun:master
...
compare: yangjun:0b455bc933bb88c7ef86021d8fec087eff9a56ff
Branches Tags
yangjun:master

3 Commits
74e696429e ... 0b455bc933

Author SHA1 Message Date
yangjun 0b455bc933 修改bug 2024-08-07 11:47:06 +08:00
yangjun 3b50444445 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java 2024-08-07 11:14:04 +08:00
yangjun 67a9755f6f 修改bug 2024-08-07 11:13:59 +08:00
1 changed files with 11 additions and 7 deletions
Show Stats Expand all files Collapse all files

18
src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
View File

@ -169,7 +169,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
//先判断是否是企业预约项目
UserPackageOrdersMapping ta = userPackageOrder.getOrdersPackageList().get(0);
MassagePackage pacT1 = massagePackageService.getById(ta.getPackageId());
if(pacT1.getType()==104) {//企业预约
if(pacT1.getType()==114) {//企业预约
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
BigDecimal canCouponMoney = BigDecimal.ZERO;//当可用代金券时的金额
@ -505,6 +505,14 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
sales = sales+quantity;
massagePackage.setSales(sales);
massagePackageService.updateSales(massagePackage);
//拆分插入用户服务器项目详情
UserPackageDetail userPackageDetail = new UserPackageDetail();
userPackageDetail.setMainId(ordersPackage.getPackageId());
List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
UserPackageDetail detail = userPackageDetailList.get(0);
BigDecimal xmsl = new BigDecimal(quantity+"");
//拆分插入用户服务包
UserPackage userPackage = new UserPackage();
userPackage.setUserId(orders.getUserId());
@ -514,8 +522,8 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
userPackage.setCreateTime(simpleDateFormat.format(new Date()));
userPackage.setTitle(massagePackage.getTitle());
userPackage.setType(massagePackage.getType());
userPackage.setOldPrice(massagePackage.getOldPrice());
userPackage.setPrice(massagePackage.getPrice());
userPackage.setOldPrice(detail.getOldPrice().multiply(xmsl).toString());
userPackage.setPrice(detail.getPrice().multiply(xmsl).toString());
userPackage.setPackageImg(massagePackage.getPackageImg());
userPackage.setContent(massagePackage.getContent());
userPackage.setContentImg(massagePackage.getContentImg());
@ -525,10 +533,6 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
userPackage.setLevel(massagePackage.getLevel());
userPackageService.insert(userPackage);
Long mainId = userPackage.getId();
//拆分插入用户服务器项目详情
UserPackageDetail userPackageDetail = new UserPackageDetail();
userPackageDetail.setMainId(ordersPackage.getPackageId());
List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
if(userPackageDetailList.size()>0){
for(int j=0;j<userPackageDetailList.size();j++){
UserPackageDetail upd = userPackageDetailList.get(j);