需求

src/main/java/com/gree/mall/manager/bean/goods/GoodsApplyVO.java

@@ -1,18 +1,23 @@
 package com.gree.mall.manager.bean.goods;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.GoodsStatusEnum;
+import com.gree.mall.manager.plus.entity.GoodsApply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ApiModel
-public class GoodsApplyVO {
+public class GoodsApplyVO   {
 
     @ZfireField(hide = true,tbName = "a")
     @TableId(value = "goods_apply_id", type = IdType.ID_WORKER_STR)
@@ -49,10 +54,27 @@ public class GoodsApplyVO {
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "商品价格")
     private BigDecimal goodsPrice;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "状态")
+    private ExamineStatusEnum status;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "申请备注")
+    private String remark;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核人")
+    private String approveName;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核时间")
+    private Date approveTime;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核备注")
+    private String approveRemark;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "提交时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "商品状态")
-    private GoodsStatusEnum status;
     @ZfireField(tbName = "b")
     @ApiModelProperty(value = "排序")
     private Integer sortNum;

src/main/java/com/gree/mall/manager/enums/ExamineStatusEnum.java

@@ -0,0 +1,29 @@
+package com.gree.mall.manager.enums;
+
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum ExamineStatusEnum implements BaseEnum {
+    WAIT("WAIT","待审核"),
+    FAIL("FAIL","驳回"),
+    OK("OK","通过");
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+
+    private final String remark;
+
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    public static ExamineStatusEnum create(String key) {
+        return BaseEnum.keyToEnum(ExamineStatusEnum.class, key);
+    }
+}

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -156,6 +156,8 @@ public class CouponLogic {
         couponBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
         couponBean.setCompanyName(adminUser.getLoginCompanyName());
         couponBean.setActiveType(2);
+        couponBean.setCompanyName(adminUser.getCompanyName());
+        couponBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         couponService.save(couponBean);
         String couponId = couponBean.getCouponId();
         if (couponBean.getCouponType().trim().equals(CouponTypeEnum.GOODS.getRemark()) && couponBean.getGoodsList() != null) {