Просмотр исходного кода

fix cashout

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
c27e0cae78
4 измененных файлов: 26 добавлений и 7 удалений
  1. +1
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +19
    -0
      mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
  4. +4
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 1
- 7
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Просмотреть файл

@@ -103,13 +103,7 @@ public class WxCashOutController extends BaseController {
WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId());
WxMall mall = wxMallService.getByTenantId(buser.getTenantId());
Map<String,Object> resultMap = new HashMap<String,Object>();
//当日提现次数
Date currDateBegin = DateUtils.stringToDate(DateUtils.format(new Date())+" 00:00:00", DateUtils.DATE_TIME_PATTERN);
if (null == merchant.getCashOutLastTime() || merchant.getCashOutLastTime().before(currDateBegin)) {
resultMap.put("cashOutCount", 0);
}else {
resultMap.put("cashOutCount", merchant.getCashOutCount());
}
resultMap.put("cashOutCount", merchant.getCashOutCount());
resultMap.put("cashOutNumber", merchant.getCashOutNumber());
resultMap.put("cashOutSupport", mall.getCashOutSupport());
resultMap.put("cashOutLimit", mall.getCashOutLimit());


+ 19
- 0
mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java Просмотреть файл

@@ -56,6 +56,25 @@ public class CashOutSchedule {
return wxMallMapper.findList(wxMall);
}

@Scheduled(cron = "* 5 * * * ?") // 执行一次
public void merchantCountSchedule() {
List<WxMall> malls = getMalls();
for (WxMall mall : malls) {
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.updateTenantInfo(mall);
List<WxMerchant> merchantList = wxMerchantMapper.findList(wxMerchant);
for (WxMerchant merchant : merchantList) {
try {
wxMerchantMapper.reSetCashCount(merchant);
}catch(Exception e) {
logger.error("merchantCountSchedule error.merchant:"+merchant.getId(),e);
}
}
}
}
@Scheduled(cron = "0/5 * * * * ?") // 执行一次
public void cashOutFailSchedule() {
List<WxMall> malls = getMalls();


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java Просмотреть файл

@@ -47,4 +47,6 @@ public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> {
void reduceCash(WxMerchant record);
void increaseCashCount(WxMerchant record);
void reSetCashCount(WxMerchant record);
}

+ 4
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -623,5 +623,9 @@
<update id="increaseCashCount" parameterType="com.iformall.domain.po.WxMerchant">
update wx_merchant set cash_out_count = cash_out_count+1 where id = #{id}
</update>
<update id="reSetCashCount" parameterType="com.iformall.domain.po.WxMerchant">
update wx_merchant set cash_out_count = 0 where id = #{id}
</update>

</mapper>

Загрузка…
Отмена
Сохранить