| @@ -43,12 +43,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | ||||
| if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); | |||||
| }else{ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); | final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -119,12 +114,13 @@ public class WxCreditHistoryController extends BaseController { | |||||
| @SystemControllerLog(description = "积分历史-导出数据") | @SystemControllerLog(description = "积分历史-导出数据") | ||||
| public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { | public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { | ||||
| // wxCreditHistory.updateTenantInfo(getTenantInfo()); | // wxCreditHistory.updateTenantInfo(getTenantInfo()); | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); | |||||
| }else{ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| // TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| // if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||||
| // wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); | |||||
| // }else{ | |||||
| // wxCreditHistory.setTenantId(tenantEntity.getTenantId()); | |||||
| // } | |||||
| wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| wxCreditHistoryService.exportData(request, response, wxCreditHistory); | wxCreditHistoryService.exportData(request, response, wxCreditHistory); | ||||
| } | } | ||||
| @@ -134,12 +130,13 @@ public class WxCreditHistoryController extends BaseController { | |||||
| public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { | public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); | logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); | ||||
| // wxCreditHistory.updateTenantInfo(getTenantInfo()); | // wxCreditHistory.updateTenantInfo(getTenantInfo()); | ||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); | |||||
| }else{ | |||||
| wxCreditHistory.setTenantId(tenantEntity.getTenantId()); | |||||
| } | |||||
| // TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| // if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||||
| // wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); | |||||
| // }else{ | |||||
| // wxCreditHistory.setTenantId(tenantEntity.getTenantId()); | |||||
| // } | |||||
| wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| return wxCreditHistoryService.getCreditSummary(wxCreditHistory); | return wxCreditHistoryService.getCreditSummary(wxCreditHistory); | ||||
| } | } | ||||
| @@ -147,6 +147,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | ||||
| log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | ||||
| if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| WxMerchantBUser bUser = getLoginBUser(); | WxMerchantBUser bUser = getLoginBUser(); | ||||
| WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | ||||
| if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { | if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { | ||||
| @@ -46,6 +46,7 @@ public class WxCreditHistoryController extends BaseController{ | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| return new ResultData(Result.ERROR,e.getMessage()); | return new ResultData(Result.ERROR,e.getMessage()); | ||||
| } | } | ||||
| wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| wxCreditHistory.setCUserId(memberId); | wxCreditHistory.setCUserId(memberId); | ||||
| wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | ||||
| @@ -32,6 +32,7 @@ public class WxScoreHistoryController extends BaseController { | |||||
| public ResultData list(Integer pageNum, Integer pageSize) { | public ResultData list(Integer pageNum, Integer pageSize) { | ||||
| WxScoreHistory wxScoreHistory = new WxScoreHistory(); | WxScoreHistory wxScoreHistory = new WxScoreHistory(); | ||||
| // wxScoreHistory.updateTenantInfo(getTenantInfo()); | // wxScoreHistory.updateTenantInfo(getTenantInfo()); | ||||
| wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); | |||||
| Long memberId; | Long memberId; | ||||
| try { | try { | ||||
| memberId = getMemberId(); | memberId = getMemberId(); | ||||
| @@ -1439,7 +1439,8 @@ public class PosServiceImpl implements PosService { | |||||
| // 2. 成长值历史回退 | // 2. 成长值历史回退 | ||||
| try { | try { | ||||
| WxScoreHistory scoreHistory = new WxScoreHistory(); | WxScoreHistory scoreHistory = new WxScoreHistory(); | ||||
| scoreHistory.updateTenantInfo(couponOrderCVo); | |||||
| // scoreHistory.updateTenantInfo(couponOrderCVo); | |||||
| scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId()); | |||||
| scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode()); | scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode()); | ||||
| scoreHistory.setCUserId(couponOrderCVo.getcUserId()); | scoreHistory.setCUserId(couponOrderCVo.getcUserId()); | ||||
| scoreHistory.setOrderId(couponOrderCVo.getOrderId()); | scoreHistory.setOrderId(couponOrderCVo.getOrderId()); | ||||
| @@ -2,6 +2,7 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -11,7 +12,7 @@ import java.util.*; | |||||
| @TableName(value = "wx_score_history") | @TableName(value = "wx_score_history") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxScoreHistory extends TenantEntity { | |||||
| public class WxScoreHistory extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @@ -283,7 +283,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| // 2. user score back | // 2. user score back | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); | |||||
| if (wxCUserBasicInfo != null) { | if (wxCUserBasicInfo != null) { | ||||
| WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); | WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo(); | ||||
| wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); | wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); | ||||
| @@ -4,7 +4,6 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxScoreHistory"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxScoreHistory"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | ||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | |||||
| <result column="c_user_id" jdbcType="BIGINT" property="cUserId"/> | <result column="c_user_id" jdbcType="BIGINT" property="cUserId"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="score_type" jdbcType="INTEGER" property="scoreType"/> | <result column="score_type" jdbcType="INTEGER" property="scoreType"/> | ||||
| @@ -17,7 +16,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` | |||||
| `id`,`tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -30,9 +29,6 @@ | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| </if> | |||||
| <if test=" null != cUserId "> | <if test=" null != cUserId "> | ||||
| and `c_user_id` = #{cUserId} | and `c_user_id` = #{cUserId} | ||||
| @@ -111,9 +107,6 @@ | |||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| </if> | |||||
| <if test=" null != cUserId "> | <if test=" null != cUserId "> | ||||
| and `c_user_id` = #{cUserId} | and `c_user_id` = #{cUserId} | ||||
| </if> | </if> | ||||