erp售后流程

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

@@ -471,8 +471,9 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
 
     @Override
     public BaseResponse refundUpdateScrm(ErpRefundUpdateRequest param) {
-
         FsStoreOrderScrm fsStoreOrder = fsStoreOrderScrmService.selectFsStoreOrderByOrderCode(param.getTid());
+        log.info("订单号: {},发货状态: {},是否发货后: {}",fsStoreOrder.getOrderCode(),fsStoreOrder.getStatus(),ObjectUtils.equals(fsStoreOrder.getStatus(),2));
+
         // 发货后退款
         if(ObjectUtils.equals(fsStoreOrder.getStatus(),2)){
 
@@ -485,14 +486,14 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             fsJstAftersalePushMapper.insert(fsJstAftersalePush);
 
         } else {
-        // 如果是发货前退款，直接走取消订单流程
-        // 如果是发货后退款，走售后流程
-        OrderCancelRequestDTO requestDTO = new OrderCancelRequestDTO();
-        requestDTO.setOIds(Collections.singletonList(Integer.valueOf(fsStoreOrder.getExtendOrderId())));
-        requestDTO.setCancelType("用户退款");
-        requestDTO.setRemark("用户退款");
-
-        jstErpHttpService.cancel(requestDTO);
+            // 如果是发货前退款，直接走取消订单流程
+            // 如果是发货后退款，走售后流程
+            OrderCancelRequestDTO requestDTO = new OrderCancelRequestDTO();
+            requestDTO.setOIds(Collections.singletonList(Integer.valueOf(fsStoreOrder.getExtendOrderId())));
+            requestDTO.setCancelType("用户退款");
+            requestDTO.setRemark("用户退款");
+
+            jstErpHttpService.cancel(requestDTO);
         }
 
 

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

@@ -62,6 +62,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.google.gson.Gson;
 import lombok.Synchronized;
+import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +72,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.DecimalFormat;
@@ -320,7 +322,14 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
 //                totalPrice = NumberUtil.add(totalPrice, NumberUtil.sub(totalAmountOfGoods, commodityDiscountAmount));
                 item.setIsAfterSales(1);
                 FsStoreOrderItemScrm orderItem=new FsStoreOrderItemScrm();
-                BeanUtil.copyProperties(item, orderItem);
+//                BeanUtil.copyProperties(item, orderItem);
+                try {
+                    BeanUtils.copyProperties(orderItem,item);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                } catch (InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                }
                 orderItemService.updateFsStoreOrderItem(orderItem);
 
             }