联合丽格v1_0_2

src/main/java/com/caimei/modules/order/service/impl/CmReturnedPurchaseServiceImpl.java

@@ -213,30 +213,32 @@ public class CmReturnedPurchaseServiceImpl implements CmReturnedPurchaseService
                 newOrder.setRefundType("1");
                 String status = newShopOrder.getShopStatus();
                 if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        newShopOrder.setShopStatus(NewOrderStatus.DAISHOU_BUFA.getCode());//待收部发
-                    }
-                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setShopStatus(NewOrderStatus.BUSHOU_BUFA.getCode());//部收部发
-                    }
-                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setShopStatus(NewOrderStatus.YISHOU_BUFA.getCode());//已收部发
-                    }
+                    newShopOrder.setShopStatus("1");//待收待发
+//                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+//                        newShopOrder.setShopStatus(NewOrderStatus.DAISHOU_BUFA.getCode());//待收部发
+//                    }
+//                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setShopStatus(NewOrderStatus.BUSHOU_BUFA.getCode());//部收部发
+//                    }
+//                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setShopStatus(NewOrderStatus.YISHOU_BUFA.getCode());//已收部发
+//                    }
                 }
             } else {
                 //不存在退款记录则本次退款为未退款
                 String status = newShopOrder.getShopStatus();
                 newOrder.setRefundType("");
                 if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        newShopOrder.setShopStatus(NewOrderStatus.DAISHOU_DAIFA.getCode());//待收待发
-                    }
-                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setShopStatus(NewOrderStatus.BUSHOU_DAIFA.getCode());//部收待发
-                    }
-                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setShopStatus(NewOrderStatus.YISHOU_DAIFA.getCode());//已收待发
-                    }
+                    newShopOrder.setShopStatus("1");//待收待发
+//                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+//                        newShopOrder.setShopStatus(NewOrderStatus.DAISHOU_DAIFA.getCode());//待收待发
+//                    }
+//                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setShopStatus(NewOrderStatus.BUSHOU_DAIFA.getCode());//部收待发
+//                    }
+//                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setShopStatus(NewOrderStatus.YISHOU_DAIFA.getCode());//已收待发
+//                    }
                 }
             }
             newShopOrder.setRefundStatus("1");//无退款