Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1441,6 +1441,7 @@ public class SubmitServiceImpl implements SubmitService {
         mainOrder.setProductTotalFee(rechargeDto.getPrice());
         mainOrder.setOrderTotalFee(rechargeDto.getPrice());
         mainOrder.setPayTotalFee(rechargeDto.getPrice());
+        mainOrder.setCouponAmount(0d);
         // 订单状态
         mainOrder.setStatus(0);
         // 余额支付金额