Parcourir la source

bug

release_toaliyun_real
xhxu il y a 5 ans
Parent
révision
95a159e08c
10 fichiers modifiés avec 114 ajouts et 8 suppressions
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java
  4. +9
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java
  6. +31
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java
  9. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
  10. +43
    -0
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Voir le fichier

@@ -62,6 +62,7 @@ public class BaseController {


/** /**
* 返回租户信息 * 返回租户信息
* 集团版帐号tenantId为空,parentTenantId为集团tenantId
* @return * @return
*/ */
public TenantEntity getTenantInfo(){ public TenantEntity getTenantInfo(){
@@ -76,6 +77,7 @@ public class BaseController {


/** /**
* 处理集团新增修改所需租户信息(广场独立修改,集团修改全部) * 处理集团新增修改所需租户信息(广场独立修改,集团修改全部)
* 处理集团版 tenantId为空,parentTenantId为集团tenantId
* ifParentUpdateTenantInfo * ifParentUpdateTenantInfo
*/ */
public TenantEntity ifParentUpdateTenantInfo() { public TenantEntity ifParentUpdateTenantInfo() {


+ 18
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Voir le fichier

@@ -2,6 +2,7 @@ package com.iformall.controller.mem;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
@@ -10,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.domain.vo.WxCreditHistoryVo;
import com.iformall.enums.EnumUserType;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxCreditHistoryService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -146,4 +148,20 @@ public class WxCreditHistoryController extends BaseController {
return wxCreditHistoryService.getCreditSummary(wxCreditHistory); return wxCreditHistoryService.getCreditSummary(wxCreditHistory);
} }



@TenantIgnore
@ApiOperation("积分清零计划")
@GetMapping("clearCreditByYear")
@SystemControllerLog(description = "积分清零计划")
public ResultData clearCreditByYear(@ModelAttribute WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear");
TenantEntity tenantInfo = getTenantInfo();
wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setOperatorId(getUserId());
wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode());
wxCreditHistoryService.clearCreditByYear(wxCreditHistory);
return new ResultData(Result.SUCCESS);
}

} }

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java Voir le fichier

@@ -68,7 +68,7 @@ public class WxPressOrderController extends BaseController {


@ApiOperation(value = "参与砍价", notes = "{\"orderId\":\"String\"}") @ApiOperation(value = "参与砍价", notes = "{\"orderId\":\"String\"}")
@PostMapping("pressOrderJoin") @PostMapping("pressOrderJoin")
@Transactional
@Transactional(rollbackFor = {Exception.class})
public ResultData pressOrderJoin(@RequestBody Map<String, String> paramMap) { public ResultData pressOrderJoin(@RequestBody Map<String, String> paramMap) {
Date curDate = new Date(); Date curDate = new Date();
String orderIdStr = paramMap.get("orderId"); String orderIdStr = paramMap.get("orderId");


+ 9
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java Voir le fichier

@@ -32,4 +32,13 @@ public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Lon
long getPeopleCount(WxCreditHistory wxCreditHistory); long getPeopleCount(WxCreditHistory wxCreditHistory);
int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);


void createCreditClearMDTable(@Param("tableSuffix")String tableSuffix);

void backUpHandleCreditClearDate(@Param("wxCreditHistory")WxCreditHistory wxCreditHistory, @Param("tableSuffix")String tableSuffix);

void updateHistoryCreditClear(@Param("wxCreditHistory")WxCreditHistory wxCreditHistory, @Param("tableSuffix")String tableSuffix);

void updateUserCreditClear(@Param("wxCreditHistory")WxCreditHistory wxCreditHistory, @Param("tableSuffix")String tableSuffix);
} }

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java Voir le fichier

@@ -8,6 +8,7 @@ import com.iformall.domain.vo.WxCreditHistoryVo;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.Map; import java.util.Map;


public interface WxCreditHistoryService { public interface WxCreditHistoryService {
@@ -72,6 +73,8 @@ public interface WxCreditHistoryService {
void clearCreditByYear(); void clearCreditByYear();


void clearCreditByYear(WxCreditHistory wxCreditHistory);

void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory); void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory);


ResultData getCreditSummary(WxCreditHistory wxCreditHistory); ResultData getCreditSummary(WxCreditHistory wxCreditHistory);


+ 31
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Voir le fichier

@@ -17,6 +17,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.ExcelService; import com.iformall.service.ExcelService;
import com.iformall.service.WxCreditHistoryService; import com.iformall.service.WxCreditHistoryService;
import com.iformall.service.WxMallService;
import com.iformall.service.WxScoreRulesService; import com.iformall.service.WxScoreRulesService;
import com.iformall.utils.CreditUtil; import com.iformall.utils.CreditUtil;
import com.iformall.utils.RedisLock; import com.iformall.utils.RedisLock;
@@ -33,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -43,8 +45,11 @@ import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {

private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");

@Autowired @Autowired
WxCreditHistoryMapper wxCreditHistoryMapper; WxCreditHistoryMapper wxCreditHistoryMapper;


@@ -78,6 +83,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Autowired @Autowired
WxLevelConfigMapper wxLevelConfigMapper; WxLevelConfigMapper wxLevelConfigMapper;


@Autowired
private WxMallService wxMallService;

@Override @Override
public void clearCreditByYear() { public void clearCreditByYear() {
WxScoreRules wxScoreRules = new WxScoreRules(); WxScoreRules wxScoreRules = new WxScoreRules();
@@ -87,6 +95,29 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {


} }


/**
* @param
*/
@Override
@Transactional(rollbackFor=Exception.class)
public void clearCreditByYear(WxCreditHistory wxCreditHistory) {
Date now = new Date();
wxCreditHistory.setTenantId(wxCreditHistory.getFinalTenantId());

String tableSuffix = "_" + Integer.parseInt(wxCreditHistory.getTenantId())%100
+ "_" + dateFormat.format(now);
wxCreditHistoryMapper.createCreditClearMDTable(tableSuffix);

wxCreditHistoryMapper.backUpHandleCreditClearDate(wxCreditHistory, tableSuffix);

wxCreditHistory.setCreditType(EnumScoreType.CLEAN_CREDIT.getCode());
wxCreditHistory.setCreateDate(now);
// wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode());
wxCreditHistoryMapper.updateHistoryCreditClear(wxCreditHistory,tableSuffix);

wxCreditHistoryMapper.updateUserCreditClear(wxCreditHistory,tableSuffix);
}

@Override @Override
public void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory) { public void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory) {
List<WxCreditHistoryVo> wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(wxCreditHistory); List<WxCreditHistoryVo> wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(wxCreditHistory);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java Voir le fichier

@@ -39,7 +39,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM
WxMsgConfigMapper wxMsgConfigMapper; WxMsgConfigMapper wxMsgConfigMapper;


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void wxMsgValidationcodeModelInit(String tenantId, String signature, String emailBgImg) { public void wxMsgValidationcodeModelInit(String tenantId, String signature, String emailBgImg) {
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTimestr = format.format(new Date()); String nowTimestr = format.format(new Date());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java Voir le fichier

@@ -69,7 +69,7 @@ public class WxParkServiceImpl implements WxParkService {
} }


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void saveOrUpdate(WxPark record) { public void saveOrUpdate(WxPark record) {
Date now = new Date(); Date now = new Date();
if (record.getId() == null) { if (record.getId() == null) {


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java Voir le fichier

@@ -69,7 +69,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
MallUserInfoService userInfoService; MallUserInfoService userInfoService;


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void initProjectConfig(Long id) { public void initProjectConfig(Long id) {
// WxProjectConfig wxProjectConfig = wxProjectConfigMapper.selectById(id); // WxProjectConfig wxProjectConfig = wxProjectConfigMapper.selectById(id);
// if(wxProjectConfig!=null && wxProjectConfig.getDelType()<10000){ // if(wxProjectConfig!=null && wxProjectConfig.getDelType()<10000){
@@ -131,7 +131,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
} }


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void initMall(WxMall wxMall) { public void initMall(WxMall wxMall) {
if(wxMall.getId() == null){ if(wxMall.getId() == null){
wxMall.setTenantId("-1"); wxMall.setTenantId("-1");
@@ -157,7 +157,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
} }


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void initBuilding(List<WxMallBuilding> wxMallBuildings) { public void initBuilding(List<WxMallBuilding> wxMallBuildings) {
wxMallBuildingService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); wxMallBuildingService.deleteByTenantId(wxMallBuildings.get(0).getTenantId());
wxMallFloorService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); wxMallFloorService.deleteByTenantId(wxMallBuildings.get(0).getTenantId());
@@ -185,7 +185,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
} }


@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void initPayAccount(WxPayAccount wxPayAccount) { public void initPayAccount(WxPayAccount wxPayAccount) {
wxPayAccountService.saveOrUpdate(wxPayAccount); wxPayAccountService.saveOrUpdate(wxPayAccount);
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxPayAccount.getTenantId()); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxPayAccount.getTenantId());
@@ -218,7 +218,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {




@Override @Override
@Transactional
@Transactional(rollbackFor = {Exception.class})
public void initUserInfo(MallUserInfo userInfo) { public void initUserInfo(MallUserInfo userInfo) {
userInfoService.saveOrUpdate(userInfo); userInfoService.saveOrUpdate(userInfo);
//创建角色 //创建角色


+ 43
- 0
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Voir le fichier

@@ -262,4 +262,47 @@
delete from wx_credit_history where id = #{id} and tenant_id = #{tenantId} delete from wx_credit_history where id = #{id} and tenant_id = #{tenantId}
</delete> </delete>





<update id="createCreditClearMDTable" parameterType="String">
CREATE TABLE `wx_credit_clear_md${tableSuffix}` (
`id` bigint(20) NOT NULL,
`user_id` bigint(20) DEFAULT NULL,
`final_tenant_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`credit` int(11) DEFAULT NULL COMMENT '用户当前总积分',
`sum_credit` int(11) DEFAULT NULL COMMENT '用户当前清零截止时间后总积分',
`credit_amount` int(11) DEFAULT NULL COMMENT '用户清零扣减积分',
`cut_off_date` datetime(0) DEFAULT NULL COMMENT '清零截止时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
</update>

<update id="backUpHandleCreditClearDate">
insert into `wx_credit_clear_md${tableSuffix}`
(`id`, `user_id`, `final_tenant_id`, `credit`, `sum_credit`, `credit_amount`, `cut_off_date`)
select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000)) id,wcubi.id user_id,wcubi.final_tenant_id,wcubi.credit,sum(wch.credit_amount) sum_credit,(sum(wch.credit_amount)-wcubi.credit) credit_amount,#{wxCreditHistory.endTime} cut_off_date
from wx_c_user_basic_info wcubi
left join wx_credit_history wch on wch.c_user_id = wcubi.id
where wcubi.final_tenant_id = #{wxCreditHistory.tenantId} and wch.credit_amount &gt; 0 and wch.create_date &gt;= #{wxCreditHistory.endTime}
group by wcubi.id
having credit &gt; sum_credit;
</update>

<update id="updateHistoryCreditClear">
insert into `wx_credit_history`
(`id`, `tenant_id`, `c_user_id`, `credit_amount`, `credit_num`, `credit_type`, `create_date`, `operator_type`, `operator_id`)
select id,final_tenant_id,user_id,sum_credit,credit_amount,#{wxCreditHistory.creditType},#{wxCreditHistory.createDate},#{wxCreditHistory.operatorType},#{wxCreditHistory.operatorId}
from `wx_credit_clear_md${tableSuffix}`;
</update>


<update id="updateUserCreditClear">
update wx_c_user_basic_info wcubi
left join `wx_credit_clear_md${tableSuffix}` wccm on wcubi.id = wccm.user_id
set wcubi.credit = (wcubi.credit + wccm.credit_amount), wcubi.update_date = now()
where wcubi.final_tenant_id = #{wxCreditHistory.tenantId} and wccm.id is not null;

</update>

</mapper> </mapper>

Chargement…
Annuler
Enregistrer