ソースを参照

bug

release_toaliyun_real
xhxu 5年前
コミット
683363fd21
8個のファイルの変更24行の追加29行の削除
  1. +15
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  3. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  4. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java
  5. +2
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  6. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  8. +1
    -8
      mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml

+ 15
- 18
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java ファイルの表示

@@ -43,12 +43,7 @@ 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();
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);
return new ResultData(page);
}
@@ -119,12 +114,13 @@ public class WxCreditHistoryController extends BaseController {
@SystemControllerLog(description = "积分历史-导出数据")
public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) {
// 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);
}

@@ -134,12 +130,13 @@ public class WxCreditHistoryController extends BaseController {
public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary");
// 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);
}



+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java ファイルの表示

@@ -147,6 +147,7 @@ public class WxCreditHistoryController extends BaseController {
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
WxMerchantBUser bUser = getLoginBUser();
WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId());
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java ファイルの表示

@@ -46,6 +46,7 @@ public class WxCreditHistoryController extends BaseController{
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setCUserId(memberId);
wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize);


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java ファイルの表示

@@ -32,6 +32,7 @@ public class WxScoreHistoryController extends BaseController {
public ResultData list(Integer pageNum, Integer pageSize) {
WxScoreHistory wxScoreHistory = new WxScoreHistory();
// wxScoreHistory.updateTenantInfo(getTenantInfo());
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
Long memberId;
try {
memberId = getMemberId();


+ 2
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java ファイルの表示

@@ -1439,7 +1439,8 @@ public class PosServiceImpl implements PosService {
// 2. 成长值历史回退
try {
WxScoreHistory scoreHistory = new WxScoreHistory();
scoreHistory.updateTenantInfo(couponOrderCVo);
// scoreHistory.updateTenantInfo(couponOrderCVo);
scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId());
scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode());
scoreHistory.setCUserId(couponOrderCVo.getcUserId());
scoreHistory.setOrderId(couponOrderCVo.getOrderId());


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java ファイルの表示

@@ -2,6 +2,7 @@ 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;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,7 @@ import java.util.*;
@TableName(value = "wx_score_history")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxScoreHistory extends TenantEntity {
public class WxScoreHistory extends BaseTenantEntity {
protected Long id;



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java ファイルの表示

@@ -283,7 +283,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
return 0;
}
// 2. user score back
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (wxCUserBasicInfo != null) {
WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo();
wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId());


+ 1
- 8
mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml ファイルの表示

@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxScoreHistory">
<id column="id" jdbcType="BIGINT" property="id"/>
<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="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="score_type" jdbcType="INTEGER" property="scoreType"/>
@@ -17,7 +16,7 @@
</resultMap>

<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 id="dynamicWhereConditions">
@@ -30,9 +29,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
@@ -111,9 +107,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>


読み込み中…
キャンセル
保存