Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java
This commit is contained in:
commit
3b50444445
|
@ -487,56 +487,116 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
|
||||||
orders.setPayTime(simpleDateFormat.format(new Date()));
|
orders.setPayTime(simpleDateFormat.format(new Date()));
|
||||||
baseMapper.updateStatus(orders);
|
baseMapper.updateStatus(orders);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//获取订单-服务包映射关系列表
|
//获取订单-服务包映射关系列表
|
||||||
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(ordersId);
|
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(ordersId);
|
||||||
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
|
||||||
int quantity = ordersPackage.getNum();
|
//先判断是否是企业预约项目
|
||||||
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
UserPackageOrdersMapping ta = mappingList.get(0);
|
||||||
//修改服务包销量
|
MassagePackage pacT1 = massagePackageService.getById(ta.getPackageId());
|
||||||
int sales = massagePackage.getSales();
|
if(pacT1.getType()==114) {//企业预约
|
||||||
sales = sales+quantity;
|
|
||||||
massagePackage.setSales(sales);
|
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
||||||
massagePackageService.updateSales(massagePackage);
|
int quantity = ordersPackage.getNum();
|
||||||
for(int i=0;i<quantity;i++){
|
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
||||||
//拆分插入用户服务包
|
//修改服务包销量
|
||||||
UserPackage userPackage = new UserPackage();
|
int sales = massagePackage.getSales();
|
||||||
userPackage.setUserId(orders.getUserId());
|
sales = sales+quantity;
|
||||||
userPackage.setPackageId(massagePackage.getId());
|
massagePackage.setSales(sales);
|
||||||
userPackage.setOrdersId(ordersId);
|
massagePackageService.updateSales(massagePackage);
|
||||||
userPackage.setOrdersNo(orders.getOrdersNo());
|
//拆分插入用户服务包
|
||||||
userPackage.setCreateTime(simpleDateFormat.format(new Date()));
|
UserPackage userPackage = new UserPackage();
|
||||||
userPackage.setTitle(massagePackage.getTitle());
|
userPackage.setUserId(orders.getUserId());
|
||||||
userPackage.setType(massagePackage.getType());
|
userPackage.setPackageId(massagePackage.getId());
|
||||||
userPackage.setOldPrice(massagePackage.getOldPrice());
|
userPackage.setOrdersId(ordersId);
|
||||||
userPackage.setPrice(massagePackage.getPrice());
|
userPackage.setOrdersNo(orders.getOrdersNo());
|
||||||
userPackage.setPackageImg(massagePackage.getPackageImg());
|
userPackage.setCreateTime(simpleDateFormat.format(new Date()));
|
||||||
userPackage.setContent(massagePackage.getContent());
|
userPackage.setTitle(massagePackage.getTitle());
|
||||||
userPackage.setContentImg(massagePackage.getContentImg());
|
userPackage.setType(massagePackage.getType());
|
||||||
userPackage.setLabels(massagePackage.getLabels());
|
userPackage.setOldPrice(massagePackage.getOldPrice());
|
||||||
userPackage.setCity(massagePackage.getCity());
|
userPackage.setPrice(massagePackage.getPrice());
|
||||||
userPackage.setClassifyId(massagePackage.getClassifyId());
|
userPackage.setPackageImg(massagePackage.getPackageImg());
|
||||||
userPackage.setLevel(massagePackage.getLevel());
|
userPackage.setContent(massagePackage.getContent());
|
||||||
userPackageService.insert(userPackage);
|
userPackage.setContentImg(massagePackage.getContentImg());
|
||||||
Long mainId = userPackage.getId();
|
userPackage.setLabels(massagePackage.getLabels());
|
||||||
//拆分插入用户服务器项目详情
|
userPackage.setCity(massagePackage.getCity());
|
||||||
UserPackageDetail userPackageDetail = new UserPackageDetail();
|
userPackage.setClassifyId(massagePackage.getClassifyId());
|
||||||
userPackageDetail.setMainId(ordersPackage.getPackageId());
|
userPackage.setLevel(massagePackage.getLevel());
|
||||||
List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
|
userPackageService.insert(userPackage);
|
||||||
if(userPackageDetailList.size()>0){
|
Long mainId = userPackage.getId();
|
||||||
for(int j=0;j<userPackageDetailList.size();j++){
|
//拆分插入用户服务器项目详情
|
||||||
UserPackageDetail upd = userPackageDetailList.get(j);
|
UserPackageDetail userPackageDetail = new UserPackageDetail();
|
||||||
upd.setMainId(mainId);
|
userPackageDetail.setMainId(ordersPackage.getPackageId());
|
||||||
upd.setCreateTime(simpleDateFormat.format(new Date()));
|
List<UserPackageDetail> userPackageDetailList = userPackageDetailService.findMassagePackageDetails(userPackageDetail);
|
||||||
upd.setLevel(massagePackage.getLevel());
|
if(userPackageDetailList.size()>0){
|
||||||
int serviceCount = upd.getServiceCount();
|
for(int j=0;j<userPackageDetailList.size();j++){
|
||||||
for(int k=0;k<serviceCount;k++){
|
UserPackageDetail upd = userPackageDetailList.get(j);
|
||||||
userPackageDetailService.insert(upd);
|
upd.setMainId(mainId);
|
||||||
updateMassageSale(upd.getMassageTypeId());
|
upd.setCreateTime(simpleDateFormat.format(new Date()));
|
||||||
|
upd.setLevel(massagePackage.getLevel());
|
||||||
|
for(int k=0;k<quantity;k++){
|
||||||
|
userPackageDetailService.insert(upd);
|
||||||
|
updateMassageSale(upd.getMassageTypeId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
|
||||||
|
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
||||||
|
int quantity = ordersPackage.getNum();
|
||||||
|
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
||||||
|
//修改服务包销量
|
||||||
|
int sales = massagePackage.getSales();
|
||||||
|
sales = sales+quantity;
|
||||||
|
massagePackage.setSales(sales);
|
||||||
|
massagePackageService.updateSales(massagePackage);
|
||||||
|
for(int i=0;i<quantity;i++){
|
||||||
|
//拆分插入用户服务包
|
||||||
|
UserPackage userPackage = new UserPackage();
|
||||||
|
userPackage.setUserId(orders.getUserId());
|
||||||
|
userPackage.setPackageId(massagePackage.getId());
|
||||||
|
userPackage.setOrdersId(ordersId);
|
||||||
|
userPackage.setOrdersNo(orders.getOrdersNo());
|
||||||
|
userPackage.setCreateTime(simpleDateFormat.format(new Date()));
|
||||||
|
userPackage.setTitle(massagePackage.getTitle());
|
||||||
|
userPackage.setType(massagePackage.getType());
|
||||||
|
userPackage.setOldPrice(massagePackage.getOldPrice());
|
||||||
|
userPackage.setPrice(massagePackage.getPrice());
|
||||||
|
userPackage.setPackageImg(massagePackage.getPackageImg());
|
||||||
|
userPackage.setContent(massagePackage.getContent());
|
||||||
|
userPackage.setContentImg(massagePackage.getContentImg());
|
||||||
|
userPackage.setLabels(massagePackage.getLabels());
|
||||||
|
userPackage.setCity(massagePackage.getCity());
|
||||||
|
userPackage.setClassifyId(massagePackage.getClassifyId());
|
||||||
|
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);
|
||||||
|
upd.setMainId(mainId);
|
||||||
|
upd.setCreateTime(simpleDateFormat.format(new Date()));
|
||||||
|
upd.setLevel(massagePackage.getLevel());
|
||||||
|
int serviceCount = upd.getServiceCount();
|
||||||
|
for(int k=0;k<serviceCount;k++){
|
||||||
|
userPackageDetailService.insert(upd);
|
||||||
|
updateMassageSale(upd.getMassageTypeId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
log.error("钱包支付服务包订单异常:" + e.getMessage(), e);
|
log.error("钱包支付服务包订单异常:" + e.getMessage(), e);
|
||||||
|
|
Loading…
Reference in New Issue