Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -22,11 +22,20 @@ public class UserVO   {
     @ZfireField(hide = true)
     private String userId;
 
-    @ApiModelProperty("所属公司编号")
-    private String companyWechatId;
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ZfireField( tbName = "b")
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
 
-    @ApiModelProperty("所属公司编号")
-    private String companyName;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "所属公司")
+    private String companyWechatName;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "所属公司编号")
+    private String companyWechatId;
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/MailBoxSendRecordVo.java

@@ -5,6 +5,8 @@ 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.IsYesNoEnum;
+import com.gree.mall.manager.enums.MailboxStatusEnum;
 import com.gree.mall.manager.plus.entity.MailboxSendRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,14 +34,14 @@ public class MailBoxSendRecordVo  {
     @ApiModelProperty(value = "接收邮箱")
     private String receiveMailbox;
 
-    @ApiModelProperty(value = "发送状态  OK 成功 NO 失败")
-    private String sendStatus;
+    @ApiModelProperty(value = "发送状态")
+    private MailboxStatusEnum sendStatus;
 
     @ApiModelProperty(value = "发送时间")
     private Date sendTime;
 
-    @ApiModelProperty(value = "回执状态 NO 未收到  YES 收到")
-    private String receiptStatus;
+    @ApiModelProperty(value = "是否收到回执")
+    private IsYesNoEnum receiptStatus;
 
     @ApiModelProperty(value = "回执收到时间")
     private Date receiptTime;

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderEmVO.java

@@ -4,6 +4,7 @@ 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.plus.entity.PolicyOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,8 +31,15 @@ public class PolicyOrderEmVO   {
     private String policyOrderId;
 
     @ApiModelProperty(value = "所属公司")
-    private String companyWechatName;
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "所属公司")
+    private String companyWechatName;
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "所属公司编号")
     private String companyWechatId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderInVO.java

@@ -5,6 +5,7 @@ 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.IsYesNoEnum;
 import com.gree.mall.manager.plus.entity.PolicyOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,12 +17,20 @@ import java.util.Date;
 @Data
 public class PolicyOrderInVO    {
 
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "商户名")
     private String companyWechatName;
 
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "商户id")
     private String companyWechatId;
 
+    @ApiModelProperty(value = "所属公司")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
+
     @ApiModelProperty(value = "代买单位")
     private String buyUnit;
 
@@ -65,8 +74,8 @@ public class PolicyOrderInVO    {
     @ApiModelProperty(value = "所属一级网点名称")
     private String classWebsitName;
 
-    @ApiModelProperty(value = "是否发送 YES 是 NO否")
-    private String isSend;
+    @ApiModelProperty(value = "是否发送")
+    private IsYesNoEnum isSend;
 
 
     @ApiModelProperty(value = "生效日期")

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderVO.java

@@ -5,6 +5,7 @@ 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.IsYesNoEnum;
 import com.gree.mall.manager.plus.entity.PolicyOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,9 +15,9 @@ import java.util.Date;
 
 @ApiModel
 @Data
-public class PolicyOrderVO   {
+public class PolicyOrderVO  {
+
 
-    @ZfireField(hide = true)
     @ApiModelProperty(value = "订单号")
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
@@ -31,8 +32,15 @@ public class PolicyOrderVO   {
     private String policyOrderId;
 
     @ApiModelProperty(value = "所属公司")
-    private String companyWechatName;
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String belongCompanyCode;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "所属公司")
+    private String companyWechatName;
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "所属公司编号")
     private String companyWechatId;
 
@@ -66,11 +74,11 @@ public class PolicyOrderVO   {
     @ApiModelProperty(value = "支付时间")
     private Date payTime;
 
-    @ApiModelProperty(value = "是否发送 YES 是 NO否")
-    private String isSend;
+    @ApiModelProperty(value = "是否发送")
+    private IsYesNoEnum isSend;
 
-    @ApiModelProperty(value = "是否收到回执 YES 是 NO否")
-    private String isReceipt;
+    @ApiModelProperty(value = "是否收到回执")
+    private IsYesNoEnum isReceipt;
 
     @ApiModelProperty(value = "发送时间")
     private Date sendTime;

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

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+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 MailboxStatusEnum implements BaseEnum {
+    OK("OK","成功"),
+    NO("NO","失败"),
+            ;
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String remark;
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyLogic.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
@@ -87,6 +88,8 @@ public class PolicyLogic {
 
         policyDetail.setCompanyWechatId(adminUser.getCompanyWechatId());
         policyDetail.setCompanyWechatName(adminUser.getCompanyName());
+        policyDetail.setEndTime(DateUtil.endOfDay(policyDetail.getEndTime()));
+        policyDetail.setStartTime(DateUtil.beginOfDay(policyDetail.getEndTime()));
 
         policyDetail.insert();
 

mall-server-api/src/main/resources/mapper/PolicyCMapper.xml

@@ -72,6 +72,7 @@
         FROM policy_order a
         ${ex.query}
         and a.type = 'AC'
+        and a.is_pay = 'YES'
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND a.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">