支付和退款优化

fs-service/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -96,7 +96,7 @@ public class LiveOrder extends BaseEntity {
     private String payType;
 
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：已取消 1：待支付 2：待发货；3：待收货；4：待评价；5：已完成） */
-    @Excel(name = "订单状态", readConverterExp = "-=1,:=,申=请退款,-=2,:=,退=货成功,1=：待支付,2=：待发货；3：待收货；4：待评价；5：已完成")
+    @Excel(name = "订单状态", readConverterExp = "订单状态 0 待支付 1 待发货 2 待收货 3 交易完成 -1退款中 -2已退款 -3已取消")
     private Integer status;
 
     /** 0 未退款 1 申请中 2 已退款 */

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1196,15 +1196,15 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         IErpOrderService erpOrderService = getErpService();
         FsErpConfig erpConfig = configUtil.generateStructConfigByKey("his.config", FsErpConfig.class);
         LiveOrder order = baseMapper.selectLiveOrderByOrderId(String.valueOf(orderId));
-        LiveAfterSales updateSales = liveAfterSalesMapper.getLiveAfterSalesByOrderId(orderId);
-        if (updateSales == null) {
-            return R.error("售后单不存在");
-        }
-        LiveAfterSales liveMp = new LiveAfterSales();
-        liveMp.setId(updateSales.getId());
-        liveMp.setStatus(LiveAfterSalesStatusEnum.STATUS_4.getValue());
-        liveMp.setSalesStatus(3);
-        liveAfterSalesMapper.updateLiveAfterSales(liveMp);
+//        LiveAfterSales updateSales = liveAfterSalesMapper.getLiveAfterSalesByOrderId(orderId);
+//        if (updateSales == null) {
+//            return R.error("售后单不存在");
+//        }
+//        LiveAfterSales liveMp = new LiveAfterSales();
+//        liveMp.setId(updateSales.getId());
+//        liveMp.setStatus(LiveAfterSalesStatusEnum.STATUS_4.getValue());
+//        liveMp.setSalesStatus(3);
+//        liveAfterSalesMapper.updateLiveAfterSales(liveMp);
         if (order == null) {
             return R.error("订单不存在");
         }
@@ -3115,6 +3115,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                     order.setPayType("1");
                     order.setPayMoney(order.getPayPrice());
                     order.setPayDelivery(BigDecimal.ZERO);
+                    order.setIsPay("1");
+                    order.setStatus(1);
                 }
                 else if(param.getPayType().equals(2)){
                     order.setPayType("2");
@@ -3122,6 +3124,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                     payMoney=new BigDecimal(payMoney.setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
                     order.setPayDelivery(order.getPayPrice().subtract(payMoney));
                     order.setPayMoney(payMoney);
+                    order.setIsPay("1");
+                    order.setStatus(1);
                 }
                 else if(param.getPayType().equals(3)){
                     //货到付款
@@ -3160,7 +3164,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 storePayment.setCompanyId(order.getCompanyId());
                 storePayment.setCompanyUserId(order.getCompanyUserId());
                 storePayment.setPayMode(fsPayConfig.getType());
-                storePayment.setStatus(0);
+                storePayment.setStatus(1);
                 storePayment.setPayCode(payCode);
                 storePayment.setPayMoney(order.getPayMoney());
                 storePayment.setCreateTime(new Date());