1.导出销售订单新增支付方式 2.修改商城订单计算金额问题 3.修改推送聚水潭订单问题

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -289,12 +289,12 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             //注释掉总买家实付
             //shopOrderDTO.setBuyerPaidAmount(fsStoreOrder.getPayDelivery());
             //应付金额(货到付款= 订单总金额 - 已付金额)
-            shopOrderDTO.setPayAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());
+            shopOrderDTO.setPayAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayMoney()).doubleValue());
 
             // 货到付款要推两次
             PaymentDTO paymentDTO2 = new PaymentDTO();
             // 物流代收金额
-            paymentDTO2.setAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayPrice()).doubleValue());
+            paymentDTO2.setAmount(fsStoreOrder.getTotalPrice().subtract(fsStoreOrder.getPayMoney()).doubleValue());
             paymentDTO2.setOuterPayId(String.format("%s%d",order.getPlatform_code(),1));
             paymentDTO2.setPayDate(order.getDeal_datetime());
             paymentDTO2.setPayment("货到付款");

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -520,14 +520,18 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
         BigDecimal payPrice = getOrderSumPrice(carts, "truePrice");
         if (StringUtils.isNotEmpty(param.getCreateOrderKey())) {
-            Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey());
-            if (payType != null && payType == 3) {
-                payPrice = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey());
-            } else {
-                BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey());
-                if (money != null) {
-                    payPrice = money;
-                }
+//            Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey());
+//            if (payType != null && payType == 3) {
+//                payPrice = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey());
+//            } else {
+//                BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey());
+//                if (money != null) {
+//                    payPrice = money;
+//                }
+//            }
+            BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey());
+            if (money != null) {
+                payPrice = money;
             }
 
         }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -119,9 +119,10 @@ public class FsStoreOrderExportVO implements Serializable
     private Date payTime;
 
     /** 支付方式 */
-    @Excel(name = "支付方式")
+    @Excel(name = "支付方式", dictType = "store_pay_type")
     private String payType;
 
+
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：已完成；-1：已退款） */
     @Excel(name = "订单状态", dictType = "store_order_status")
     private String status;