提交 资金接口

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderLogVo.java

@@ -18,7 +18,7 @@ public class GoblinOrderLogVo implements Cloneable {
     private String orderCode;
     @ApiModelProperty(value = "支付单号")
     private String payCode;
-    @ApiModelProperty(value = "订单类型")
+    @ApiModelProperty(value = "订单类型[order-普通订单|zhengzai-正在下单]")
     private String orderType;
     @ApiModelProperty(value = " 商铺id")
     private String storeId;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMoneyServiceImpl.java

@@ -30,18 +30,18 @@ public class GoblinStoreMoneyServiceImpl implements IGoblinStoreMoneyService {
         if (vo == null) {
             return ResponseDto.failure("店铺不存在");
         }
-        BigDecimal price = mongoUtils.storeMoney("1");
+        BigDecimal price = mongoUtils.storeMoney(vo.getStoreId());
         return ResponseDto.success(price);
     }
 
     @Override
     public ResponseDto<PageInfo<GoblinOrderLogVo>> getSpuList(String spuName, String st, String et, int page) {
         String uid = CurrentUtil.getCurrentUid();
-//        GoblinStoreInfoVo vo = redisUtils.getStoreInfoVoByUid(uid);
-//        if (vo == null) {
-//            return ResponseDto.failure("店铺不存在");
-//        }
-        HashMap<String, Object> map = mongoUtils.moneyGetSpuList(spuName, st, et, "2", page);
+        GoblinStoreInfoVo vo = redisUtils.getStoreInfoVoByUid(uid);
+        if (vo == null) {
+            return ResponseDto.failure("店铺不存在");
+        }
+        HashMap<String, Object> map = mongoUtils.moneyGetSpuList(spuName, st, et, vo.getStoreId(), page);
         PageInfo<GoblinOrderLogVo> info = new PageInfo((List<GoblinOrderLogVo>) map.get("data"));
         info.setTotal((Long) map.get("total"));
         return ResponseDto.success(info);