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

fix b端核销列表总数bug

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
d7003807de
4 измененных файлов: 4 добавлений и 6 удалений
  1. +0
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 0
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -131,7 +131,6 @@ public class WxCouponOrderController extends BaseController {
}


@RedisCache
@ApiOperation("某日期交易总流水")
@GetMapping("getUnverifiedAmountOnDate")
@ApiImplicitParams({
@@ -140,7 +139,6 @@ public class WxCouponOrderController extends BaseController {
return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, false);
}

@RedisCache
@ApiOperation("某日期核销总流水")
@GetMapping("getVerifiedAmountOnDate")
@ApiImplicitParams({


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

@@ -54,7 +54,7 @@ public class DaliyAmountSchedule {
merchantBUserQ.updateTenantInfo(merchant);
merchantBUserQ.setMerchantId(merchant.getId());
List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ);
dateMap.put("bUserIds", bUserIds);
dateMap.put("bUserIdList", bUserIds);

List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap);
logger.info("find " + list.size() + " coupon order from " + startDate + " to " + endDate);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -284,7 +284,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
merchantBUserQ.updateTenantInfo(wxMerchant);
merchantBUserQ.setMerchantId(wxMerchant.getId());
List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ);
dateMap.put("bUserIds", bUserIds);
dateMap.put("bUserIdList", bUserIds);
list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap);
}else {
dateMap.put("startDateTimes", startDate.getTime());


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

@@ -160,9 +160,9 @@
from wx_coupon_order co
where co.tenant_id = #{tenantId}
AND co.coupon_order_status = '1'
<if test=" null != bUserIds ">
<if test=" null != bUserIdList ">
and co.b_user_id in
<foreach collection="bUserIds" index="index" item="bUserIdItem" open="(" separator="," close=")">
<foreach collection="bUserIdList" index="index" item="bUserIdItem" open="(" separator="," close=")">
#{bUserIdItem}
</foreach>
</if>


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