Explorar el Código

修复查看提现记录接口报错bug

codingliang hace 2 años
padre
commit
df658c2f6e

+ 2 - 2
src/main/java/com/sqx/modules/shop/controller/app/ShopMoneyController.java

@@ -116,12 +116,12 @@ public class ShopMoneyController extends AbstractController {
         map.put("limit",limit);
         if(shopId!=null){
             GoodsShop goodsShop = goodsShopDao.selectById(shopId);
-            map.put("userId",goodsShop.getUserId());
+            map.put("userId",goodsShop.getUserId().toString());
         }else{
             SysUserEntity user = getUser();
             Long adminUserId = user.getUserId();
             UserEntity userEntity = userDao.selectOne(new QueryWrapper<UserEntity>().eq("admin_user_id", adminUserId));
-            map.put("userId",userEntity.getUserId());
+            map.put("userId",userEntity.getUserId().toString());
         }
         PageUtils pageUtils = cashOutService.selectCashOutList(map);
         return Result.success().put("data",pageUtils);

+ 1 - 1
src/main/resources/mapper/pay/CashDao.xml

@@ -259,7 +259,7 @@
                 and co.create_at <![CDATA[ >= ]]> #{params.startTime}
             </if>
             <if test="params.endTime != null and params.endTime != '' and params.endTime != 'null'">
-                and co.create_at <![CDATA[ ><= ]]> #{params.endTime}
+                and co.create_at <![CDATA[ <= ]]> #{params.endTime}
             </if>
             <if test="params.shopName != null and params.shopName != '' and params.shopName != 'null'">
                 and gh.shop_name like concat('%',#{params.shopName},'%')