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 fa9276ee6..730500817 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -8,6 +8,7 @@ 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.base.TenantEntity; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.exception.MallinkException; import com.iformall.service.WxCreditHistoryService; @@ -42,7 +43,12 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.updateTenantInfo(getTenantInfo()); + TenantEntity tenantEntity = ifParentUpdateTenantInfo(); + if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ + wxCreditHistory.setTenantId(tenantEntity.getParentTenantId()); + }else{ + wxCreditHistory.setTenantId(tenantEntity.getTenantId()); + } final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } @@ -111,7 +117,13 @@ public class WxCreditHistoryController extends BaseController { @GetMapping("exportData") @SystemControllerLog(description = "积分历史-导出数据") 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()); + } wxCreditHistoryService.exportData(request, response, wxCreditHistory); } @@ -120,7 +132,13 @@ public class WxCreditHistoryController extends BaseController { @SystemControllerLog(description = "积分历史-积分统计概览") public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { 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()); + } return wxCreditHistoryService.getCreditSummary(wxCreditHistory); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 59ec3ad85..18aa16d2b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index c0d20aad3..a22ee6880 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -30,7 +30,7 @@ public class WxScoreHistoryController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(Integer pageNum, Integer pageSize) { WxScoreHistory wxScoreHistory = new WxScoreHistory(); - wxScoreHistory.updateTenantInfo(getTenantInfo()); +// wxScoreHistory.updateTenantInfo(getTenantInfo()); wxScoreHistory.setCUserId(getMemberId()); wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 8da81c41d..d2e3018ce 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1421,7 +1421,12 @@ public class PosServiceImpl implements PosService { creditHistory.setOperatorType(EnumUserType.BUSER.getCode()); creditHistory.setOperatorId(buUserId); creditHistory.setCUserId(couponOrderCVo.getcUserId()); - creditHistory.updateTenantInfo(couponOrderCVo); +// creditHistory.updateTenantInfo(couponOrderCVo); + if(StringUtils.isNotBlank(couponOrderCVo.getParentTenantId())){ + creditHistory.setTenantId(couponOrderCVo.getParentTenantId()); + }else{ + creditHistory.setTenantId(couponOrderCVo.getTenantId()); + } creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(couponOrderCVo.getCouponId()); int num = creditHistoryService.cancelCredit(creditHistory); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 72c22aa7c..7876eacee 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -21,8 +21,6 @@ public interface WxCreditHistoryMapper extends CommonMapper - group by wcubi.reportTime + group by reportTime @@ -617,7 +617,7 @@ and wcubi.create_date < #{basicInfo.endTime} - group by wcubi.reportTime + group by reportTime diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index db9d2a0c5..8fffd5b8b 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -105,11 +105,11 @@ and credit.create_date < #{endTime} - and credit.`tenant_id` = #{tenantId} - - - and credit.`parent_tenant_id` = #{parentTenantId} + and ( credit.`tenant_id` = #{tenantId} or credit.`parent_tenant_id` = #{tenantId} ) + + + and credit.operator_type = #{operatorType} @@ -236,18 +236,6 @@ and `credit_type` = #{creditType} - - - update wx_credit_history - set c_user_id=#{newUserId} - where c_user_id = #{cUserId} - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - -