From 8293c77c8e806dd06b9995fddd79eb79411f7df0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 25 Dec 2020 10:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCUserBasicInfoController.java | 16 +++++++++++ .../iformall/domain/po/WxCUserBasicInfo.java | 17 ++++++++++++ .../mapper/WxCreditHistoryMapper.java | 3 +++ .../service/WxCreditHistoryService.java | 3 +++ .../impl/WxCreditHistoryServiceImpl.java | 10 +++++++ .../mapper/WxCUserBasicInfoMapper.xml | 18 +++++++++++++ .../mapper/WxCreditHistoryMapper.xml | 27 +++++++++++++++++++ 7 files changed, 94 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index fcb96418e..a92f77ab4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -86,6 +86,9 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired private WxMerchantMapper wxMerchantMapper; + @Autowired + private WxCreditHistoryService wxCreditHistoryService; + private void setUserInfoLevel(WxCUserBasicInfo info) { if (info.getPoins() == null || info.getPoins() == 0) { @@ -129,6 +132,16 @@ public class WxCUserBasicInfoController extends BaseController { info.setCarCount(wxCUserCarService.countUserCar(wxCUserCar)); } + private void setCreditSumDate(WxCUserBasicInfo info){ + WxCreditHistory wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setTenantId(info.getFinalTenantId()); + wxCreditHistory.setCUserId(info.getId()); + wxCreditHistory.setStartTime(info.getCreditStartTime()); + wxCreditHistory.setEndTime(info.getCreditEndTime()); + info.setAddCredit(wxCreditHistoryService.getAddCreditSummary(wxCreditHistory)); + info.setLesCredit(wxCreditHistoryService.getLesCreditSummary(wxCreditHistory)); + } + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -155,6 +168,9 @@ public class WxCUserBasicInfoController extends BaseController { for (WxCUserBasicInfo info : page.getList()) { // setUserInfoLevel(info); setUserInfoCarCount(info); + info.setCreditStartTime(wxCUserBasicInfo.getCreditStartTime()); + info.setCreditEndTime(wxCUserBasicInfo.getCreditEndTime()); + setCreditSumDate(info); } } return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 8546f0dec..4edbb73e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -106,6 +106,14 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; + @io.swagger.annotations.ApiModelProperty(value="扣减积分",name="lesCredit") + @TableField(exist = false) + private Integer lesCredit; + + @io.swagger.annotations.ApiModelProperty(value="增加积分",name="addCredit") + @TableField(exist = false) + private Integer addCredit; + @io.swagger.annotations.ApiModelProperty(value="活动记录",name="actRecord") private Integer actRecord; @@ -129,11 +137,20 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private Integer carCount; + @TableField(exist = false) + private String carNumber; + @TableField(exist = false) private Date startTime; @TableField(exist = false) private Date endTime; + + @TableField(exist = false) + private Date creditStartTime; + + @TableField(exist = false) + private Date creditEndTime; @TableField(exist = false) private Integer begin; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 6d8994969..580d1ebb4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -35,4 +35,7 @@ public interface WxCreditHistoryMapper extends CommonMapper listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 1a13de243..42babbc68 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -116,6 +116,12 @@ and wcubi.`status` = #{status} + + + and wcubi.id in (select c_user_id from wx_c_user_car + where (`tenant_id` = #{finalTenantId} or `parent_tenant_id` = #{finalTenantId}) + and car_number like concat('%', #{carNumber},'%')) + and wcubi.id in @@ -220,6 +226,18 @@ and wcubi.`status` = #{basicInfo.status} + + and wcubi.id in (select c_user_id from wx_c_user_car + where 1=1 + + and `tenant_id` = #{tenantInfo.tenantId} + + + and `parent_tenant_id` = #{tenantInfo.parentTenantId} + + and car_number like concat('%', #{basicInfo.carNumber},'%')) + + and wcubi.id in diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 451a64680..91f355615 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -247,6 +247,33 @@ and credit.credit_num < 0 + + + +