|
@@ -169,6 +169,12 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
|
|
|
private OrderMessageVO getOrderMessage(WeiXinPayDTO weiXinPayDTO, PersonnelVO personVO) {
|
|
|
OrderMessageVO orderMessageVO = new OrderMessageVO();
|
|
|
List<GoodVO> goodVOS = weiXinPayDTO.getGoods();
|
|
|
+ iF(goodVOS==null){
|
|
|
+ orderMessageVO.setPrice(0d);
|
|
|
+ orderMessageVO.setFinalPrice(0d);
|
|
|
+ orderMessageVO.setDiscount(1d);
|
|
|
+ return orderMessageVO;
|
|
|
+ }
|
|
|
List<Integer> assoVoucherIds = weiXinPayDTO.getPersonVoucherIds();
|
|
|
Integer type = weiXinPayDTO.getGoodType();
|
|
|
Integer activityId = weiXinPayDTO.getActivityId();
|
|
@@ -182,8 +188,10 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
|
|
|
|
|
|
BigDecimal allPriceBig = new BigDecimal(allPrice.toString());
|
|
|
BigDecimal voucherMonBig = new BigDecimal(voucherMon.toString());
|
|
|
+
|
|
|
BigDecimal withVocherPriceBig = allPriceBig.subtract(voucherMonBig);
|
|
|
weiXinPayDTO.setPrice(withVocherPriceBig.doubleValue());
|
|
|
+ System.out.println("价格"+weiXinPayDTO.getPrice());
|
|
|
Object obj = activityService.executeActivity(weiXinPayDTO, type, 0, activityId);
|
|
|
Double trueDiscount = (Double) obj;
|
|
|
if (trueDiscount == null) {
|