联合丽格v1_0_2

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

@@ -323,38 +323,6 @@ public class CmReturnedPurchaseServiceImpl implements CmReturnedPurchaseService
             // 付供应商
             double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getShopPostFee() + shopOrder.getTotalAddedValueTax();
             shopOrder.setShouldPayShopAmount(shouldPayShopAmount);
-            if (CollectionUtils.isNotEmpty(returnedPurchaseRecord)) {
-                //存在退款记录则本次撤销后订单状态为部分退款
-                //部分退货
-                shopOrder.setOrderStatusFlag("2");
-                String status = shopOrder.getShopStatus();
-                if (StringUtils.equals("7", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", shopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        shopOrder.setShopStatus(NewOrderStatus.DAISHOU_BUFA.getCode());//待收部发
-                    }
-                    if (StringUtils.equals("2", shopOrder.getReceiptStatus())) {
-                        shopOrder.setShopStatus(NewOrderStatus.BUSHOU_BUFA.getCode());//部收部发
-                    }
-                    if (StringUtils.equals("3", shopOrder.getReceiptStatus())) {
-                        shopOrder.setShopStatus(NewOrderStatus.YISHOU_BUFA.getCode());//已收部发
-                    }
-                }
-            } else {
-                //不存在退款记录则本次退款为未退款
-                String status = shopOrder.getShopStatus();
-                shopOrder.setOrderStatusFlag("2");
-                if (StringUtils.equals("7", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", shopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        shopOrder.setShopStatus(NewOrderStatus.DAISHOU_DAIFA.getCode());//待收待发
-                    }
-                    if (StringUtils.equals("2", shopOrder.getReceiptStatus())) {
-                        shopOrder.setShopStatus(NewOrderStatus.BUSHOU_DAIFA.getCode());//部收待发
-                    }
-                    if (StringUtils.equals("3", shopOrder.getReceiptStatus())) {
-                        shopOrder.setShopStatus(NewOrderStatus.YISHOU_DAIFA.getCode());//已收待发
-                    }
-                }
-            }
             shopOrderDao.update(shopOrder);
         }
 

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -336,6 +336,7 @@ public class OrderUtils {
                 newShopOrder.setRestAmount(sub.doubleValue());
 
                 Double ColdChina = Double.valueOf(700);
+                String shopPostFlag = newShopOrder.getShopPostFlag()!=null?newShopOrder.getShopPostFlag():"-2";
                 String PostageInfo = null;
                 if (null!=newShopOrder.getIsColdChina()&&newShopOrder.getIsColdChina()==1) {
                     if ("2".equals(newShopOrder.getShopPostFlag())) {
@@ -349,7 +350,7 @@ public class OrderUtils {
                         PostageInfo = "￥" + MathUtil.add(newShopOrder.getShopPostFee(), ColdChina) + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + newShopOrder.getShopPostFee()+ ")";
                     }
                 } else {
-                    PostageInfo = newShopOrder.getShopPostFlag().equals("2") ? "到付" : newShopOrder.getShopPostFlag()  .equals( "0") ? "包邮" : "￥" + newShopOrder.getShopPostFee();
+                    PostageInfo = shopPostFlag.equals("2") ? "到付" : shopPostFlag.equals("0") ? "包邮" : "￥" + newShopOrder.getShopPostFee();
                 }
                 //支付凭证
                 List<Voucher> vouchers = newOrderService.findVoucher(newShopOrder.getShopOrderId());