Преглед изворни кода

修改商户查询结算单的时间显示

Yangzw пре 8 месеци
родитељ
комит
3b1f026adb

+ 4 - 1
feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -28,7 +28,10 @@ public enum CaclEnum {
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
     SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
     ORDER_PAY_FREEZE_HIGH_QUOTA(23, "购物获得","消费者购物,获得冻结峰值"),
-    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值")
+    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值"),
+    MANUAL_RETURN_INTEGRAL(25, "人工返回最早七天未获得的超出额度的合赢奖","人工返回最早七天未获得的合赢奖,超额的"),
+    WITHDRAWAL(26, "用户提现","用户将可用积分提现到账户"),
+    WITHDRAWAL_ERROR(27, "提现失败退回","提现失败退回积分到用户"),
     ;
 
 //    ORDER_GET_FREEZE_INTEGRAL(12,"购物返积分"),//购物获得冻结积分

+ 1 - 0
feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/shopsettlement/ShopSettlementServiceImpl.java

@@ -82,6 +82,7 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
         PageResult<ShopSettlementRespVO> result = BeanUtils.toBean(shopSettlementDOPageResult, ShopSettlementRespVO.class);
         for (ShopSettlementRespVO shopSettlementRespVO : result.getList()) {
             shopSettlementRespVO.setShopName(shopSettlementMapper.getShopName(shopSettlementRespVO.getShopId()));
+            shopSettlementRespVO.setCreateTime(shopSettlementRespVO.getCreateTime().minusDays(1));
         }
         return result;
     }