|
@@ -169,7 +169,7 @@ 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){
|
|
|
+ if(goodVOS==null){
|
|
|
orderMessageVO.setPrice(0d);
|
|
|
orderMessageVO.setFinalPrice(0d);
|
|
|
orderMessageVO.setDiscount(1d);
|
|
@@ -191,7 +191,7 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
|
|
|
|
|
|
BigDecimal withVocherPriceBig = allPriceBig.subtract(voucherMonBig);
|
|
|
weiXinPayDTO.setPrice(withVocherPriceBig.doubleValue());
|
|
|
- System.out.println("价格"+weiXinPayDTO.getPrice());
|
|
|
+ System.out.println("价格是"+weiXinPayDTO.getPrice());
|
|
|
Object obj = activityService.executeActivity(weiXinPayDTO, type, 0, activityId);
|
|
|
Double trueDiscount = (Double) obj;
|
|
|
if (trueDiscount == null) {
|