From f5fe59db96372aff57d09bad04d6b402f325894a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 25 Dec 2020 16:16:09 +0800 Subject: [PATCH] chepai --- .../controller/mem/WxCUserCarController.java | 1 + .../mem/WxCreditHistoryController.java | 22 ++++++- .../com/iformall/domain/po/WxCUserCar.java | 5 ++ .../resources/mapper/WxCUserCarMapper.xml | 59 +++++++++---------- 4 files changed, 54 insertions(+), 33 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java index 45893dd90..fb768c5ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java @@ -32,6 +32,7 @@ public class WxCUserCarController extends BaseController { public ResultData list(@ModelAttribute WxCUserCar wxCUserCar, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCUserCarController::list"); if (null == wxCUserCar) wxCUserCar = new WxCUserCar(); + wxCUserCar.updateTenantInfo(getTenantInfo()); final PageInfo page = wxCUserCarService.listAsPage(wxCUserCar, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 47523890e..b8a443bde 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -9,11 +9,15 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCreditHistoryVo; +import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCreditHistoryService; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -34,7 +38,10 @@ public class WxCreditHistoryController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxCreditHistoryService wxCreditHistoryService; + WxCreditHistoryService wxCreditHistoryService; + + @Autowired + private WxMerchantService wxMerchantService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -87,6 +94,19 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setOperatorId(user.getId()); wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode()); + String desc = ""; + if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ + WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); + desc = "A端("+user.getUsername()+")操作新增商户("+byId.getName()+")消费("+wxCreditHistory.getSpendStr()+"元)积分"; + }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ + desc = "A端("+user.getUsername()+")操作积分兑换"; + if(StringUtils.isNotBlank(wxCreditHistory.getChangePurpose())){ + desc = desc + "("+wxCreditHistory.getChangePurpose()+")"; + } + }else{ + desc = "A端("+user.getUsername()+")操作未知积分来源"; + } + wxCreditHistory.setChangePurpose(desc); try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ; WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index 2a8c641aa..4661f60a6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.BaseTenantEntity; import com.iformall.domain.po.base.TenantEntity; @@ -18,6 +19,10 @@ public class WxCUserCar extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; + + @TableField(exist = false) + private String userPhone; + @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") private String carNumber; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index 9d840b757..e0d8f55db 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -6,6 +6,9 @@ + + + @@ -15,80 +18,72 @@ - `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date`,`vendor_type`,`vendor_params`,`vendor_person_id` + wcuc.`id`,wcuc.`tenant_id`,wcuc.`parent_tenant_id`,wcuc.`c_user_id`,wcuc.`car_number`,wcuc.`create_date`,wcuc.`update_date`,wcuc.`vendor_type`,wcuc.`vendor_params`,wcuc.`vendor_person_id`,wcubi.`phone` - where 1 = 1 - + where 1 = 1 - and `id` = #{id} - + and wcuc.`id` = #{id} - and `tenant_id` = #{tenantId} + and wcuc.`tenant_id` = #{tenantId} - and `parent_tenant_id` = #{parentTenantId} + and wcuc.`parent_tenant_id` = #{parentTenantId} - and `c_user_id` = #{cUserId} - + and wcuc.`c_user_id` = #{cUserId} - and `car_number` = #{carNumber} + and wcuc.`car_number` = #{carNumber} - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - + and wcuc.`create_date` = #{createDate} + - and `vendor_type` = #{vendorType} - + and wcuc.`vendor_type` = #{vendorType} - - and `vendor_params` like concat('%', #{vendorParams},'%') - - + - and `vendor_person_id` = #{vendorPersonId} - + and wcuc.`vendor_person_id` = #{vendorPersonId} - and id in + and wcuc.id in #{idItem} - order by ${sortColumns} + + order by wcuc.create_date