需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/apply/WorkerApplyLogic.java

@@ -11,12 +11,8 @@ import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
 import com.gree.mall.miniapp.commonmapper.workorder.OrderBaseCMapper;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
-import com.gree.mall.miniapp.plus.entity.PgOrderBase;
-import com.gree.mall.miniapp.plus.entity.WorkerInvolveApply;
-import com.gree.mall.miniapp.plus.entity.WorkerInvolveApplyItem;
-import com.gree.mall.miniapp.plus.service.PgOrderBaseService;
-import com.gree.mall.miniapp.plus.service.WorkerInvolveApplyItemService;
-import com.gree.mall.miniapp.plus.service.WorkerInvolveApplyService;
+import com.gree.mall.miniapp.plus.entity.*;
+import com.gree.mall.miniapp.plus.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,12 +29,22 @@ public class WorkerApplyLogic {
     private final PgOrderBaseService pgOrderBaseService;
     private final OrderBaseCMapper orderBaseCMapper;
     private final CommonLogic commonLogic;
+    private final WorkerInvolvePrincipalService workerInvolvePrincipalService;
+    private final WorkerInvolvePrincipalItemService workerInvolvePrincipalItemService;
 
     public void add(WorkerInvolveApply workerInvolveApply) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerInvolveApply.getOrderBaseId());
         workerInvolveApply.setWebsitId(pgOrderBase.getWebsitId());
         workerInvolveApply.setWebsitName(pgOrderBase.getWebsitName());
+
+        WorkerInvolvePrincipalItem workerInvolvePrincipalItem = workerInvolvePrincipalItemService.lambdaQuery().eq(WorkerInvolvePrincipalItem::getWebsitId, workerInvolveApply.getWebsitId())
+                .last("limit 1").one();
+        if (workerInvolvePrincipalItem != null){
+            WorkerInvolvePrincipal workerInvolvePrincipal = workerInvolvePrincipalService.getById(workerInvolvePrincipalItem.getPrincipalId());
+            workerInvolveApply.setAuditPrincipal(workerInvolvePrincipal.getPrincipal());
+
+        }
         workerInvolveApply.setUserId(currentCompanyWechat.getUserId());
         workerInvolveApply.setApplyWorkerName(currentCompanyWechat.getUser().getNickName());
         workerInvolveApply.setApplyWorkerNumber(currentCompanyWechat.getUser().getWorkerNumber());

mall-server-api/src/main/java/com/gree/mall/manager/bean/apply/WorkerInvolveApplyVO.java

@@ -3,7 +3,9 @@ package com.gree.mall.manager.bean.apply;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.WorkerInvolveChargeEnum;
 import com.gree.mall.manager.enums.WorkerInvolveEnum;
+import com.gree.mall.manager.plus.entity.WorkerInvolveApply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +16,7 @@ import java.util.Date;
 @ApiModel
 @Data
 @ZfireField(tbName = "a")
-public class WorkerInvolveApplyVO    {
+public class WorkerInvolveApplyVO{
 
     @ApiModelProperty(value = "状态")
     private WorkerInvolveEnum status;
@@ -92,4 +94,37 @@ public class WorkerInvolveApplyVO    {
 
     @ApiModelProperty(value = "申请理由")
     private String reason;
+
+
+
+    @ApiModelProperty(value = "申请费用")
+    private BigDecimal websitMaintenancePricePass;
+
+    @ApiModelProperty(value = "网点审批时间")
+    private Date websitAuditTime;
+
+    @ApiModelProperty(value = "网点审批人")
+    private String websitPrincipal;
+
+    @ApiModelProperty(value = "网点审批备注")
+    private String websitRemark;
+
+    @ApiModelProperty(value = "是否向客户收费")
+    private WorkerInvolveChargeEnum websitCustomerCharges;
+
+
+    @ApiModelProperty(value = "中心审批负责人")
+    private String auditPrincipal;
+
+    @ApiModelProperty(value = "审批费用")
+    private BigDecimal maintenancePricePass;
+
+    @ApiModelProperty(value = "中心审核时间")
+    private Date auditTime;
+
+    @ApiModelProperty(value = "中心审批人")
+    private String principal;
+
+    @ApiModelProperty(value = "中心审批备注")
+    private String remark;
 }

mall-server-api/src/main/java/com/gree/mall/manager/enums/WorkerInvolveChargeEnum.java

@@ -0,0 +1,27 @@
+package com.gree.mall.manager.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum WorkerInvolveChargeEnum implements BaseEnum, IEnum<Integer> {
+    ZERO("1","是"),
+    ONE("2","否");
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String remark;
+
+    @Override
+    public Integer getValue() {
+        return Integer.parseInt(key);
+    }
+
+}