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

mall-server-api/src/main/java/com/gree/mall/manager/bean/common/CallRecordOrderVo.java

@@ -20,10 +20,10 @@ public class CallRecordOrderVo   {
     @ZfireField(hide = true)
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "工单号")
     private String orderBaseId;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "当时的工单状态")
     private String orderStatus;
 
@@ -32,25 +32,25 @@ public class CallRecordOrderVo   {
 
     @ApiModelProperty(value = "通话类型")
     private String callType2;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "师傅手机号")
     private String workerMobile;
 
     @ApiModelProperty(value = "通话发起时间")
     private Date startTime;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "摘机接通时间")
     private Date start;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "通话结束时间")
     private Date end;
 
     @ApiModelProperty(value = "客户手机号")
     private String phone;
 
-    @ApiModelProperty(value = "师傅/信息员云呼信息")
+    @ApiModelProperty(value = "后台云呼信息")
     private String promoter;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "回访成功/回访失败")
     private String status;
 
@@ -62,17 +62,17 @@ public class CallRecordOrderVo   {
 
     @ApiModelProperty(value = "录音文件")
     private String fileUrl;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "录音转文本")
     private String contentText;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "原因描述")
     private String remark;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
-
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createBy;

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

@@ -0,0 +1,94 @@
+package com.gree.mall.manager.bean.policy;
+
+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.plus.entity.PolicyOrder;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PolicyOrderEmVO   {
+
+    @ApiModelProperty(value = "订单号")
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "保单状态")
+    private String policyOrderStatus;
+
+    @ApiModelProperty(value = "保单名称")
+    private String policyName;
+
+    @ApiModelProperty(value = "保单编号")
+    private String policyOrderId;
+
+    @ApiModelProperty(value = "所属公司")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "工程师编号")
+    private String workerNumber;
+
+    @ApiModelProperty(value = "工程师")
+    private String workerName;
+
+    @ApiModelProperty(value = "身份证")
+    private String workerIdcard;
+
+    @ApiModelProperty(value = "工程师电话")
+    private String workerMobile;
+
+
+    @ApiModelProperty(value = "被替换工程师")
+    private String replaceName;
+
+    @ApiModelProperty(value = "被替换工程师身份证")
+    private String replaceIdcard;
+
+    @ApiModelProperty(value = "被替换工程师编号")
+    private String replaceNumber;
+
+    @ApiModelProperty(value = "被替换工程师联系电话")
+    private String replacePhone;
+
+
+    @ApiModelProperty(value = "生效日期")
+    private Date startTime;
+
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "操作时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+
+
+}

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

@@ -0,0 +1,104 @@
+package com.gree.mall.manager.bean.policy;
+
+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;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PolicyOrderInVO    {
+
+    @ApiModelProperty(value = "商户名")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "代买单位")
+    private String buyUnit;
+
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+
+
+    @ApiModelProperty(value = "工程师编号")
+    private String workerNumber;
+
+    @ApiModelProperty(value = "工程师")
+    private String workerName;
+
+    @ApiModelProperty(value = "身份证")
+    private String workerIdcard;
+
+    @ApiModelProperty(value = "工程师电话")
+    private String workerMobile;
+
+
+    @ApiModelProperty(value = "支付金额")
+    private String payAmount;
+
+    @ApiModelProperty(value = "保单状态")
+    private String policyOrderStatus;
+
+
+
+    @ApiModelProperty(value = "保单名称")
+    private String policyName;
+
+
+    @ApiModelProperty(value = "所属一级网点编号")
+    private String classWebsitId;
+
+    @ApiModelProperty(value = "所属一级网点名称")
+    private String classWebsitName;
+
+    @ApiModelProperty(value = "是否发送 YES 是 NO否")
+    private String isSend;
+
+
+    @ApiModelProperty(value = "生效日期")
+    private Date startTime;
+
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "订单号")
+    private String id;
+
+
+
+
+
+}

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

@@ -0,0 +1,105 @@
+package com.gree.mall.manager.bean.policy;
+
+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;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PolicyOrderVO   {
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "订单号")
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "保单状态")
+    private String policyOrderStatus;
+
+    @ApiModelProperty(value = "保单名称")
+    private String policyName;
+
+    @ApiModelProperty(value = "保单编号")
+    private String policyOrderId;
+
+    @ApiModelProperty(value = "所属公司")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "所属公司编号")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "工程师编号")
+    private String workerNumber;
+
+    @ApiModelProperty(value = "工程师")
+    private String workerName;
+
+    @ApiModelProperty(value = "身份证")
+    private String workerIdcard;
+
+    @ApiModelProperty(value = "工程师电话")
+    private String workerMobile;
+
+    @ApiModelProperty(value = "邮件批次号")
+    private String sendBatch;
+
+    @ApiModelProperty(value = "支付金额")
+    private String payAmount;
+
+    @ApiModelProperty(value = "微信流水号")
+    private String transactionId;
+
+    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
+
+    @ApiModelProperty(value = "是否发送 YES 是 NO否")
+    private String isSend;
+
+    @ApiModelProperty(value = "是否收到回执 YES 是 NO否")
+    private String isReceipt;
+
+    @ApiModelProperty(value = "发送时间")
+    private Date sendTime;
+
+    @ApiModelProperty(value = "回执时间")
+    private Date receiptTime;
+
+    @ApiModelProperty(value = "生效日期")
+    private Date startTime;
+
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/PolicyCMapper.java

@@ -2,10 +2,7 @@ package com.gree.mall.manager.commonmapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.policy.AgreementVo;
-import com.gree.mall.manager.bean.policy.MailBoxSendRecordVo;
-import com.gree.mall.manager.bean.policy.MailboxSendRecordPolicyVo;
-import com.gree.mall.manager.bean.policy.PolicyVo;
+import com.gree.mall.manager.bean.policy.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +19,10 @@ public interface PolicyCMapper {
     IPage<MailBoxSendRecordVo> listMailBoxRecord(Page page, @Param("ex")ZfireParamBean zfireParam, @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     IPage<MailboxSendRecordPolicyVo> listPolicy(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);
+
+    IPage<PolicyOrderVO> listPolicyOrder(Page page,@Param("ex") ZfireParamBean zfireParam, @Param("adminCompanyIds")List<String> adminCompanyIds);
+
+    IPage<PolicyOrderEmVO> listEm(Page page, @Param("ex")ZfireParamBean zfireParam,@Param("adminCompanyIds") List<String> adminCompanyIds);
+
+    IPage<PolicyOrderInVO> listIn(Page page, @Param("ex")ZfireParamBean zfireParam, @Param("adminCompanyIds") List<String> adminCompanyIds);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/PolicyOrderController.java

@@ -0,0 +1,140 @@
+package com.gree.mall.manager.controller.policy;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.policy.PolicyDetail;
+import com.gree.mall.manager.bean.policy.PolicyOrderEmVO;
+import com.gree.mall.manager.bean.policy.PolicyOrderInVO;
+import com.gree.mall.manager.bean.policy.PolicyOrderVO;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.policy.PolicyOrderLogic;
+import com.gree.mall.manager.plus.entity.PolicyOrder;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+
+@Slf4j
+@RestController
+@Api(value = "保险API", tags = {"保险API"})
+@RequestMapping(value = "/policyOrder", produces = "application/json; charset=utf-8")
+public class PolicyOrderController {
+
+    @Autowired
+    private PolicyOrderLogic policyOrderLogic;
+
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "意外保险订单列表")
+    public ResponseHelper<IPage<PolicyOrderVO>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<PolicyOrderVO> policyOrderVOIPage = policyOrderLogic.listPolicyOrder(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<PolicyOrderVO>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "意外保险订单列表导出")
+    public void listExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<PolicyOrderVO> policyOrderVOIPage = policyOrderLogic.listPolicyOrder(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+    @ZfireList
+    @PostMapping("/listEm")
+    @ApiOperation(value = "雇主险订单列表")
+    public ResponseHelper<IPage<PolicyOrderEmVO>> listEm(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<PolicyOrderEmVO> policyOrderVOIPage = policyOrderLogic.listEm(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<PolicyOrderEmVO>() {});
+    }
+
+    @PostMapping("/listEm/export")
+    @ApiOperation(value = "雇主险订单列表导出")
+    public void listEmExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<PolicyOrderEmVO> policyOrderVOIPage = policyOrderLogic.listEm(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation("保险险订单详情")
+    public ResponseHelper<PolicyOrder> detail(
+            @ApiParam(value = "id", required = true) @RequestParam String id,
+            HttpServletRequest request
+    ) throws ParseException {
+        PolicyOrder policyDetail = policyOrderLogic.detail(id);
+        return ResponseHelper.success(policyDetail);
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("保险订单修改")
+    public ResponseHelper add(
+            @RequestBody PolicyOrder policyOrder,
+            HttpServletRequest request
+    ) throws ParseException {
+        policyOrderLogic.update(policyOrder);
+        return ResponseHelper.success();
+    }
+
+
+
+    @ZfireList
+    @PostMapping("/listIn")
+    @ApiOperation(value = "工伤险列表")
+    public ResponseHelper<IPage<PolicyOrderInVO>> listIn(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<PolicyOrderInVO> policyOrderVOIPage = policyOrderLogic.listIn(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<PolicyOrderInVO>() {});
+    }
+
+    @PostMapping("/listIn/export")
+    @ApiOperation(value = "工伤险订单列表导出")
+    public void listInExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<PolicyOrderInVO> policyOrderVOIPage = policyOrderLogic.listIn(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+
+
+}

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

@@ -0,0 +1,83 @@
+package com.gree.mall.manager.logic.policy;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.policy.PolicyOrderEmVO;
+import com.gree.mall.manager.bean.policy.PolicyOrderInVO;
+import com.gree.mall.manager.bean.policy.PolicyOrderVO;
+import com.gree.mall.manager.bean.policy.PolicyVo;
+import com.gree.mall.manager.commonmapper.PolicyCMapper;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.PolicyOrder;
+import com.gree.mall.manager.plus.service.PolicyOrderService;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PolicyOrderLogic {
+
+
+    @Autowired
+    PolicyCMapper policyCMapper;
+
+    @Autowired
+    CommonLogic commonLogic;
+
+    @Autowired
+    PolicyOrderService policyOrderService;
+
+    public IPage<PolicyOrderVO> listPolicyOrder(Page page, ZfireParamBean zfireParam) {
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, PolicyOrderVO.class,adminUser);
+
+        IPage<PolicyOrderVO> policyOrderVOIPage = policyCMapper.listPolicyOrder(page, zfireParam,adminCompanyIds);
+        return policyOrderVOIPage;
+    }
+
+    public IPage<PolicyOrderEmVO> listEm(Page page, ZfireParamBean zfireParam) {
+
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, PolicyOrderEmVO.class,adminUser);
+
+        IPage<PolicyOrderEmVO> policyOrderVOIPage = policyCMapper.listEm(page, zfireParam,adminCompanyIds);
+
+        return policyOrderVOIPage;
+    }
+
+
+    public IPage<PolicyOrderInVO> listIn(Page page, ZfireParamBean zfireParam) {
+
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, PolicyOrderInVO.class,adminUser);
+
+        IPage<PolicyOrderInVO> policyOrderVOIPage = policyCMapper.listIn(page, zfireParam,adminCompanyIds);
+
+        return policyOrderVOIPage;
+    }
+
+    public PolicyOrder detail(String id) {
+        PolicyOrder byId = policyOrderService.getById(id);
+        return byId;
+    }
+
+    public void update(PolicyOrder policyOrder) {
+        policyOrder.updateById();
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/unicom/UnicomLogic.java

@@ -231,7 +231,8 @@ public class UnicomLogic {
             if(ring != null && ringingTime != null) {
                 callRecord.setRingTimestamp((int)DateUtil.betweenMs(ring,ringingTime));
             }
-            callRecord.setFileUrl(filepath);
+            String ossUrl = ossUtil.getAccessUrl()+filepath;
+            callRecord.setFileUrl(ossUrl);
             if(callRecord.getCallTimestamp() > 0){
                 callRecord.setStatus("回访成功");
             }else{

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -110,7 +110,6 @@ unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
 unicome.yunh.appid=69jpgmwqxyhtcsor
 
-
 #法大大
 fadada.app.id=401793
 fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL

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

@@ -66,4 +66,73 @@
         </if>
         ${ex.orderBy}
     </select>
+    <select id="listPolicyOrder" resultType="com.gree.mall.manager.bean.policy.PolicyOrderVO">
+        SELECT
+        ${ex.selected}
+        FROM policy_order a
+        ${ex.query}
+        and a.type = 'AC'
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+    <select id="listEm" resultType="com.gree.mall.manager.bean.policy.PolicyOrderEmVO">
+        SELECT
+        ${ex.selected}
+        FROM policy_order a
+        ${ex.query}
+        and a.type = 'EM'
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+    <select id="listIn" resultType="com.gree.mall.manager.bean.policy.PolicyOrderInVO">
+        SELECT
+        ${ex.selected}
+        FROM policy_order a
+        ${ex.query}
+        and a.type = 'IN'
+        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
 </mapper>