用户钱包明细中加项目名称、项目类型
This commit is contained in:
parent
d75f121417
commit
5db1154b9f
|
@ -74,6 +74,8 @@ import com.sqx.modules.pay.entity.PayClassifyDetail;
|
||||||
import com.sqx.modules.pay.entity.PayDetails;
|
import com.sqx.modules.pay.entity.PayDetails;
|
||||||
import com.sqx.modules.pay.service.PayClassifyDetailService;
|
import com.sqx.modules.pay.service.PayClassifyDetailService;
|
||||||
import com.sqx.modules.pay.service.PayClassifyService;
|
import com.sqx.modules.pay.service.PayClassifyService;
|
||||||
|
import com.sqx.modules.sys.entity.SysDictEntity;
|
||||||
|
import com.sqx.modules.sys.service.SysDictService;
|
||||||
import com.sqx.modules.utils.AmountCalUtils;
|
import com.sqx.modules.utils.AmountCalUtils;
|
||||||
import com.sqx.modules.utils.SenInfoCheckUtil;
|
import com.sqx.modules.utils.SenInfoCheckUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
@ -177,6 +179,8 @@ public class AliPayController {
|
||||||
private ArtificerRechargeRewardService artificerRechargeRewardService;
|
private ArtificerRechargeRewardService artificerRechargeRewardService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ArtificerIntegralStatisticsService artificerIntegralStatisticsService;
|
private ArtificerIntegralStatisticsService artificerIntegralStatisticsService;
|
||||||
|
@Autowired
|
||||||
|
private SysDictService sysDictService;
|
||||||
|
|
||||||
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
|
@ -1010,7 +1014,7 @@ public class AliPayController {
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
}
|
}
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+orders.getEntryName()+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付服订单");
|
userMoneyDetails.setTitle("支付服订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
|
@ -1345,12 +1349,23 @@ public class AliPayController {
|
||||||
}else if(payDetails.getType()==7){
|
}else if(payDetails.getType()==7){
|
||||||
//服务包下单,分单
|
//服务包下单,分单
|
||||||
UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
||||||
|
String title = "";
|
||||||
|
String typeStr = "";
|
||||||
|
//获取订单-服务包映射关系列表
|
||||||
|
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
if(mappingList!=null && mappingList.size()>0){
|
||||||
|
UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
title = uom.getTitle();
|
||||||
|
Integer type = uom.getType();
|
||||||
|
SysDictEntity dict = sysDictService.getById(type);
|
||||||
|
typeStr = dict.getValue();
|
||||||
|
}
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
userMoneyDetails.setManipulateType(1);
|
userMoneyDetails.setManipulateType(1);
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付服务包订单");
|
userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -1363,8 +1378,6 @@ public class AliPayController {
|
||||||
orders.setPayTime(sdf.format(new Date()));
|
orders.setPayTime(sdf.format(new Date()));
|
||||||
userPackageOrderDao.updateStatus(orders);
|
userPackageOrderDao.updateStatus(orders);
|
||||||
|
|
||||||
//获取订单-服务包映射关系列表
|
|
||||||
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
||||||
int quantity = ordersPackage.getNum();
|
int quantity = ordersPackage.getNum();
|
||||||
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
||||||
|
@ -1417,12 +1430,23 @@ public class AliPayController {
|
||||||
}
|
}
|
||||||
}else if(payDetails.getType()==8) {
|
}else if(payDetails.getType()==8) {
|
||||||
UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
||||||
|
String title = "";
|
||||||
|
String typeStr = "";
|
||||||
|
//获取订单-服务包映射关系列表
|
||||||
|
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
if(mappingList!=null && mappingList.size()>0){
|
||||||
|
UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
title = uom.getTitle();
|
||||||
|
Integer type = uom.getType();
|
||||||
|
SysDictEntity dict = sysDictService.getById(type);
|
||||||
|
typeStr = dict.getValue();
|
||||||
|
}
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
userMoneyDetails.setManipulateType(1);
|
userMoneyDetails.setManipulateType(1);
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付团购订单");
|
userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -1445,7 +1469,6 @@ public class AliPayController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MassagePackage massagePackage = null;
|
MassagePackage massagePackage = null;
|
||||||
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
if(mappingList.size()>0){
|
if(mappingList.size()>0){
|
||||||
Long packageId = mappingList.get(0).getPackageId();
|
Long packageId = mappingList.get(0).getPackageId();
|
||||||
massagePackage = massagePackageService.getById(packageId);
|
massagePackage = massagePackageService.getById(packageId);
|
||||||
|
@ -2806,7 +2829,7 @@ public class AliPayController {
|
||||||
// userMoneyDetails.setMoney(orders.getPayMoney());
|
// userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
// }
|
// }
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
// userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
// userMoneyDetails.setContent("项目名称:"+orders.getEntryName()+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
// userMoneyDetails.setTitle("支付订单");
|
// userMoneyDetails.setTitle("支付订单");
|
||||||
// userMoneyDetails.setType(2);
|
// userMoneyDetails.setType(2);
|
||||||
// userMoneyDetails.setState(2);
|
// userMoneyDetails.setState(2);
|
||||||
|
@ -3142,12 +3165,23 @@ public class AliPayController {
|
||||||
// }else if(payDetails.getType()==7){
|
// }else if(payDetails.getType()==7){
|
||||||
// //服务包下单,分单
|
// //服务包下单,分单
|
||||||
// UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
// UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
||||||
|
// String title = "";
|
||||||
|
// String typeStr = "";
|
||||||
|
// //获取订单-服务包映射关系列表
|
||||||
|
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
// if(mappingList!=null && mappingList.size()>0){
|
||||||
|
// UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
// title = uom.getTitle();
|
||||||
|
// Integer type = uom.getType();
|
||||||
|
// SysDictEntity dict = sysDictService.getById(type);
|
||||||
|
// typeStr = dict.getValue();
|
||||||
|
// }
|
||||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
// userMoneyDetails.setManipulateType(1);
|
// userMoneyDetails.setManipulateType(1);
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
// userMoneyDetails.setMoney(orders.getPayMoney());
|
// userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
// userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
// userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
// userMoneyDetails.setTitle("支付服务包订单");
|
// userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
// userMoneyDetails.setType(2);
|
// userMoneyDetails.setType(2);
|
||||||
// userMoneyDetails.setState(2);
|
// userMoneyDetails.setState(2);
|
||||||
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -3275,12 +3309,23 @@ public class AliPayController {
|
||||||
//
|
//
|
||||||
// }else if(payDetails.getType()==8) {
|
// }else if(payDetails.getType()==8) {
|
||||||
// UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
// UserPackageOrder orders = userPackageOrderDao.getByNo(outTradeNo);
|
||||||
|
// String title = "";
|
||||||
|
// String typeStr = "";
|
||||||
|
// //获取订单-服务包映射关系列表
|
||||||
|
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
// if(mappingList!=null && mappingList.size()>0){
|
||||||
|
// UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
// title = uom.getTitle();
|
||||||
|
// Integer type = uom.getType();
|
||||||
|
// SysDictEntity dict = sysDictService.getById(type);
|
||||||
|
// typeStr = dict.getValue();
|
||||||
|
// }
|
||||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
// userMoneyDetails.setManipulateType(1);
|
// userMoneyDetails.setManipulateType(1);
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
// userMoneyDetails.setMoney(orders.getPayMoney());
|
// userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
// userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
// userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
// userMoneyDetails.setTitle("支付团购订单");
|
// userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
// userMoneyDetails.setType(2);
|
// userMoneyDetails.setType(2);
|
||||||
// userMoneyDetails.setState(2);
|
// userMoneyDetails.setState(2);
|
||||||
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
|
|
@ -65,6 +65,8 @@ import com.sqx.modules.pay.entity.PayDetails;
|
||||||
import com.sqx.modules.pay.service.PayClassifyDetailService;
|
import com.sqx.modules.pay.service.PayClassifyDetailService;
|
||||||
import com.sqx.modules.pay.service.PayClassifyService;
|
import com.sqx.modules.pay.service.PayClassifyService;
|
||||||
import com.sqx.modules.pay.service.WxService;
|
import com.sqx.modules.pay.service.WxService;
|
||||||
|
import com.sqx.modules.sys.entity.SysDictEntity;
|
||||||
|
import com.sqx.modules.sys.service.SysDictService;
|
||||||
import com.sqx.modules.utils.*;
|
import com.sqx.modules.utils.*;
|
||||||
import jodd.util.StringUtil;
|
import jodd.util.StringUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
@ -169,6 +171,8 @@ public class WxServiceImpl implements WxService {
|
||||||
private ArtificerRechargeRewardService artificerRechargeRewardService;
|
private ArtificerRechargeRewardService artificerRechargeRewardService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ArtificerIntegralStatisticsService artificerIntegralStatisticsService;
|
private ArtificerIntegralStatisticsService artificerIntegralStatisticsService;
|
||||||
|
@Autowired
|
||||||
|
private SysDictService sysDictService;
|
||||||
|
|
||||||
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
|
@ -2003,7 +2007,7 @@ public class WxServiceImpl implements WxService {
|
||||||
// userMoneyDetails.setMoney(orders.getPayMoney());
|
// userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
// }
|
// }
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
// userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
// userMoneyDetails.setContent("项目名称:"+orders.getEntryName()+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
// userMoneyDetails.setTitle("支付订单");
|
// userMoneyDetails.setTitle("支付订单");
|
||||||
// userMoneyDetails.setType(2);
|
// userMoneyDetails.setType(2);
|
||||||
// userMoneyDetails.setState(2);
|
// userMoneyDetails.setState(2);
|
||||||
|
@ -2326,12 +2330,22 @@ public class WxServiceImpl implements WxService {
|
||||||
// }else if(payDetails.getType()==7){
|
// }else if(payDetails.getType()==7){
|
||||||
// //服务包下单,分单
|
// //服务包下单,分单
|
||||||
// UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
// UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
||||||
|
// String title = "";
|
||||||
|
// String typeStr = "";
|
||||||
|
// //获取订单-服务包映射关系列表
|
||||||
|
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
// if(mappingList!=null && mappingList.size()>0){
|
||||||
|
// UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
// title = uom.getTitle();
|
||||||
|
// SysDictEntity dict = sysDictService.getById(uom.getType());
|
||||||
|
// typeStr = dict.getValue();
|
||||||
|
// }
|
||||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
// userMoneyDetails.setManipulateType(1);
|
// userMoneyDetails.setManipulateType(1);
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
// userMoneyDetails.setMoney(orders.getPayMoney());
|
// userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
// userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
// userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
// userMoneyDetails.setTitle("支付服务包订单");
|
// userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
// userMoneyDetails.setType(2);
|
// userMoneyDetails.setType(2);
|
||||||
// userMoneyDetails.setState(2);
|
// userMoneyDetails.setState(2);
|
||||||
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -2343,12 +2357,8 @@ public class WxServiceImpl implements WxService {
|
||||||
// orders.setPayWay(payDetails.getClassify());
|
// orders.setPayWay(payDetails.getClassify());
|
||||||
// orders.setPayTime(sdf.format(new Date()));
|
// orders.setPayTime(sdf.format(new Date()));
|
||||||
// userPackageOrderDao.updateStatus(orders);
|
// userPackageOrderDao.updateStatus(orders);
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// //获取订单-服务包映射关系列表
|
// //获取订单-服务包映射关系列表
|
||||||
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
//
|
|
||||||
// //先判断是否是企业预约项目
|
// //先判断是否是企业预约项目
|
||||||
// UserPackageOrdersMapping ta = mappingList.get(0);
|
// UserPackageOrdersMapping ta = mappingList.get(0);
|
||||||
// MassagePackage pacT1 = massagePackageService.getById(ta.getPackageId());
|
// MassagePackage pacT1 = massagePackageService.getById(ta.getPackageId());
|
||||||
|
@ -2460,6 +2470,16 @@ public class WxServiceImpl implements WxService {
|
||||||
// }else if(payDetails.getType()==8) {
|
// }else if(payDetails.getType()==8) {
|
||||||
// //服务包下单,分单
|
// //服务包下单,分单
|
||||||
// UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
// UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
||||||
|
// String title = "";
|
||||||
|
// String typeStr = "";
|
||||||
|
// //获取订单-服务包映射关系列表
|
||||||
|
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
// if(mappingList!=null && mappingList.size()>0){
|
||||||
|
// UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
// title = uom.getTitle();
|
||||||
|
// SysDictEntity dict = sysDictService.getById(uom.getType());
|
||||||
|
// typeStr = dict.getValue();
|
||||||
|
// }
|
||||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
// userMoneyDetails.setManipulateType(1);
|
// userMoneyDetails.setManipulateType(1);
|
||||||
// userMoneyDetails.setUserId(orders.getUserId());
|
// userMoneyDetails.setUserId(orders.getUserId());
|
||||||
|
@ -2489,7 +2509,6 @@ public class WxServiceImpl implements WxService {
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// MassagePackage massagePackage = null;
|
// MassagePackage massagePackage = null;
|
||||||
// List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
// if(mappingList.size()>0){
|
// if(mappingList.size()>0){
|
||||||
// Long packageId = mappingList.get(0).getPackageId();
|
// Long packageId = mappingList.get(0).getPackageId();
|
||||||
// massagePackage = massagePackageService.getById(packageId);
|
// massagePackage = massagePackageService.getById(packageId);
|
||||||
|
@ -3077,7 +3096,7 @@ public class WxServiceImpl implements WxService {
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
}
|
}
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+orders.getEntryName()+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付订单");
|
userMoneyDetails.setTitle("支付订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
|
@ -3414,12 +3433,22 @@ public class WxServiceImpl implements WxService {
|
||||||
}else if(payDetails.getType()==7){
|
}else if(payDetails.getType()==7){
|
||||||
//服务包下单,分单
|
//服务包下单,分单
|
||||||
UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
||||||
|
String title = "";
|
||||||
|
String typeStr = "";
|
||||||
|
//获取订单-服务包映射关系列表
|
||||||
|
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
if(mappingList!=null && mappingList.size()>0){
|
||||||
|
UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
title = uom.getTitle();
|
||||||
|
SysDictEntity dict = sysDictService.getById(uom.getType());
|
||||||
|
typeStr = dict.getValue();
|
||||||
|
}
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
userMoneyDetails.setManipulateType(1);
|
userMoneyDetails.setManipulateType(1);
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付服务包订单");
|
userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -3433,7 +3462,6 @@ public class WxServiceImpl implements WxService {
|
||||||
userPackageOrderDao.updateStatus(orders);
|
userPackageOrderDao.updateStatus(orders);
|
||||||
|
|
||||||
//获取订单-服务包映射关系列表
|
//获取订单-服务包映射关系列表
|
||||||
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
for (UserPackageOrdersMapping ordersPackage : mappingList) {
|
||||||
int quantity = ordersPackage.getNum();
|
int quantity = ordersPackage.getNum();
|
||||||
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
MassagePackage massagePackage = massagePackageService.getById(ordersPackage.getPackageId());
|
||||||
|
@ -3487,12 +3515,22 @@ public class WxServiceImpl implements WxService {
|
||||||
}else if(payDetails.getType()==8) {
|
}else if(payDetails.getType()==8) {
|
||||||
//服务包下单,分单
|
//服务包下单,分单
|
||||||
UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
UserPackageOrder orders = userPackageOrderDao.getByNo(out_trade_no);
|
||||||
|
String title = "";
|
||||||
|
String typeStr = "";
|
||||||
|
//获取订单-服务包映射关系列表
|
||||||
|
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
||||||
|
if(mappingList!=null && mappingList.size()>0){
|
||||||
|
UserPackageOrdersMapping uom = mappingList.get(0);
|
||||||
|
title = uom.getTitle();
|
||||||
|
SysDictEntity dict = sysDictService.getById(uom.getType());
|
||||||
|
typeStr = dict.getValue();
|
||||||
|
}
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
userMoneyDetails.setManipulateType(1);
|
userMoneyDetails.setManipulateType(1);
|
||||||
userMoneyDetails.setUserId(orders.getUserId());
|
userMoneyDetails.setUserId(orders.getUserId());
|
||||||
userMoneyDetails.setMoney(orders.getPayMoney());
|
userMoneyDetails.setMoney(orders.getPayMoney());
|
||||||
userMoneyDetails.setContent("订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
userMoneyDetails.setContent("项目名称:"+title+";订单号:" + orders.getOrdersNo() + ",已经下单成功!");
|
||||||
userMoneyDetails.setTitle("支付团购订单");
|
userMoneyDetails.setTitle("支付"+typeStr+"订单");
|
||||||
userMoneyDetails.setType(2);
|
userMoneyDetails.setType(2);
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||||
|
@ -3516,7 +3554,6 @@ public class WxServiceImpl implements WxService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MassagePackage massagePackage = null;
|
MassagePackage massagePackage = null;
|
||||||
List<UserPackageOrdersMapping> mappingList = userPackageOrdersMappingService.findListByOrdersId(orders.getOrdersId());
|
|
||||||
if(mappingList.size()>0){
|
if(mappingList.size()>0){
|
||||||
Long packageId = mappingList.get(0).getPackageId();
|
Long packageId = mappingList.get(0).getPackageId();
|
||||||
massagePackage = massagePackageService.getById(packageId);
|
massagePackage = massagePackageService.getById(packageId);
|
||||||
|
|
Loading…
Reference in New Issue