需求

src/main/java/com/zfire/mall/manager/bean/listV2/K3MaterialVO.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 public class K3MaterialVO {
 
-    @ZfireField(hide = true,pk = true)
+    @ZfireField(hide = true)
     private String id;
 
     @ApiModelProperty(value = "物料编码")

src/main/java/com/zfire/mall/manager/logic/retail/RetailOrderLogic.java

@@ -1621,14 +1621,17 @@ public class RetailOrderLogic {
                 && !retailOrder.getExamineStatus().equals(ExamineStatusEnum.WAIT.toString())){
             throw new RemoteServiceException("已审单据不可关闭");
         }
+
+        //全退
+        if(StringUtils.equals(retailOrder.getExamineStatus(),ExamineStatusEnum.WAIT.toString()))
+            this.refundAll(retailOrder);
+
         retailOrder.setExamineStatus(ExamineStatusEnum.CLOSE.toString());
         retailOrder.setCloseName(adminUser.getNickName());
         retailOrder.setCloseTime(new Date());
         retailOrder.updateById();
 
-        //全退
-        if(StringUtils.equals(retailOrder.getExamineStatus(),ExamineStatusEnum.WAIT.toString()))
-            this.refundAll(retailOrder);
+
     }