‘linchangsheng’ vor 3 Monaten
Ursprung
Commit
f6efa1058f

+ 23 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/apply/WorkerInvolveLogic.java

@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -131,16 +132,25 @@ public class WorkerInvolveLogic {
     }
 
     public void websitAppeal(WorkerInvolveApplyBean workerInvolveApplyBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
 
         workerInvolveApplyBean.setStatus(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitStatus());
 
-        workerInvolveApplyBean.updateById();
         workerInvolveApplyBean.getWorkerInvolveApplyItem().setInvolveApplyId(workerInvolveApplyBean.getId());
+        workerInvolveApplyBean.getWorkerInvolveApplyItem().setWebsitPrincipal(adminUser.getNickName());
+        workerInvolveApplyBean.getWorkerInvolveApplyItem().setWebsitAuditTime(new Date());
         workerInvolveApplyBean.getWorkerInvolveApplyItem().insert();
+
+        workerInvolveApplyBean.setWebsitMaintenancePricePass(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitMaintenancePricePass());
+        workerInvolveApplyBean.setWebsitAuditTime(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitAuditTime());
+        workerInvolveApplyBean.setWebsitPrincipal(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitPrincipal());
+        workerInvolveApplyBean.setWebsitRemark(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitRemark());
+        workerInvolveApplyBean.setWebsitCustomerCharges(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitCustomerCharges());
+        workerInvolveApplyBean.updateById();
     }
 
     public void appeal(WorkerInvolveApplyItem workerInvolveApplyItem) {
-
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         if (!workerInvolveApplyItem.getWebsitStatus().equals(5))
             throw new RemoteServiceException("网点未审批通过");
 
@@ -148,9 +158,19 @@ public class WorkerInvolveLogic {
         WorkerInvolveApply workerInvolveApply = workerInvolveApplyService.getById(workerInvolveApplyItem.getInvolveApplyId());
 
         workerInvolveApply.setStatus(workerInvolveApplyItem.getStatus());
-
+        workerInvolveApply.setPrincipal(adminUser.getNickName());
+        workerInvolveApply.setRemark(workerInvolveApplyItem.getRemark());
+        workerInvolveApply.setMaintenancePricePass(workerInvolveApplyItem.getMaintenancePricePass());
+        workerInvolveApply.setAuditTime(new Date());
         workerInvolveApply.updateById();
 
+
+        workerInvolveApplyItem.setPrincipal(adminUser.getNickName());
+        workerInvolveApplyItem.setRemark(workerInvolveApplyItem.getRemark());
+        workerInvolveApplyItem.setMaintenancePricePass(workerInvolveApplyItem.getMaintenancePricePass());
+        workerInvolveApplyItem.setAuditTime(new Date());
         workerInvolveApplyItem.updateById();
+
+
     }
 }