Browse Source

积分

release_toaliyun_real
xhxu 5 years ago
parent
commit
36b4a60c1b
7 changed files with 35 additions and 25 deletions
  1. +21
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java
  4. +6
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  5. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  7. +4
    -16
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 21
- 3
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java View File

@@ -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<WxCreditHistoryVo> 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);
}



+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java View File

@@ -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;


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java View File

@@ -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<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize);


+ 6
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -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);


+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java View File

@@ -21,8 +21,6 @@ public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Lon

int countList(WxCreditHistory wxCreditHistory);

int updateNewId(WxCreditHistoryNewIdVo wxCreditHistory);

long getTotalCreditAmount(WxCreditHistory wxCreditHistory);

long getIncrementCreditAmount(WxCreditHistory wxCreditHistory);


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -564,7 +564,7 @@
and wcubi.create_date &lt; #{endTime}
</if>
<if test="1 == reportType or 2 == reportType or 3 == reportType">
group by wcubi.reportTime
group by reportTime
</if>
</select>

@@ -617,7 +617,7 @@
and wcubi.create_date &lt; #{basicInfo.endTime}
</if>
<if test="1 == basicInfo.reportType or 2 == basicInfo.reportType or 3 == basicInfo.reportType">
group by wcubi.reportTime
group by reportTime
</if>
</select>



+ 4
- 16
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml View File

@@ -105,11 +105,11 @@
and credit.create_date &lt; #{endTime}
</if>
<if test=" null != tenantId and '' != tenantId">
and credit.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and credit.`parent_tenant_id` = #{parentTenantId}
and ( credit.`tenant_id` = #{tenantId} or credit.`parent_tenant_id` = #{tenantId} )
</if>
<!-- <if test=" null != parentTenantId and '' != parentTenantId">-->
<!-- and credit.`parent_tenant_id` = #{parentTenantId}-->
<!-- </if>-->
<if test=" null != operatorType ">
and credit.operator_type = #{operatorType}
</if>
@@ -236,18 +236,6 @@
and `credit_type` = #{creditType}
</if>
</select>

<update id="updateNewId" parameterType="com.iformall.domain.vo.WxCreditHistoryNewIdVo">
update wx_credit_history
set c_user_id=#{newUserId}
where c_user_id = #{cUserId}
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
</update>
<select id="getTotalCreditAmount" parameterType="com.iformall.domain.po.WxCreditHistory"
resultType="java.lang.Long">


Loading…
Cancel
Save