Merge branch 'dev_v1_1_20220720'

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -124,7 +124,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
             }
 
             // 确认退款 取消平台收入和 分润
-            setRecord(returnApply);
+            setRecord(omsOrderReturnApply);
 
         } else if (status.equals(3)) {
             //拒绝退货
@@ -142,7 +142,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
 
     @Override
     public void setTestReturnApply(Long id) {
-        OmsOrderReturnApply returnApply = new OmsOrderReturnApply();
+        OmsOrderReturnApply returnApply = returnApplyMapper.selectByPrimaryKey(id);
         returnApply.setId(id);
         returnApply.setStatus(2);
         returnApply.setReceiveTime(new Date());