提交 资金接口

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreMoneyService.java

@@ -9,10 +9,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 public interface IGoblinStoreMoneyService {
 
-    ResponseDto<BigDecimal> money();
+    ResponseDto<HashMap<String,String>> money(String spuId);
 
     ResponseDto<PageInfo<GoblinOrderLogVo>> getSpuList(String spuName, String st, String et, int page);
 

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 
 @ApiSupport(order = 149102)
@@ -29,9 +30,12 @@ public class GoblinStoreMoneyController {
 
     @GetMapping("money")
     @ApiOperation("商品资金总收入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "spuId", value = "spuId"),
+    })
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<BigDecimal> money() {
-        return goblinStoreMoneyService.money();
+    public ResponseDto<HashMap<String,String>> money(@RequestParam(value = "spuId", required = false) String spuId) {
+        return goblinStoreMoneyService.money(spuId);
     }
 
     @GetMapping("spu/list")

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

 package com.liquidnet.service.goblin.service.impl.manage;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinOrderLogVo;
@@ -24,14 +25,18 @@ public class GoblinStoreMoneyServiceImpl implements IGoblinStoreMoneyService {
     GoblinMongoUtils mongoUtils;
 
     @Override
-    public ResponseDto<BigDecimal> money() {
+    public ResponseDto<HashMap<String,String>> money(String spuId) {
         String uid = CurrentUtil.getCurrentUid();
         GoblinStoreInfoVo vo = redisUtils.getStoreInfoVoByUid(uid);
         if (vo == null) {
             return ResponseDto.failure("店铺不存在");
         }
-        BigDecimal price = mongoUtils.storeMoney(vo.getStoreId());
-        return ResponseDto.success(price);
+        String data = mongoUtils.storeMoney(vo.getStoreId(), spuId);
+        String[] array = data.split(",");
+        HashMap<String,String> map = CollectionUtil.mapStringString();
+        map.put("name",array[0]);
+        map.put("price",array[1]);
+        return ResponseDto.success(map);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -504,7 +504,7 @@ public class GoblinMongoUtils {
     }
 
     //修改 订单退款数据
-    public UpdateResult updateGoblinBackOrderVo(String backOrderId,GoblinBackOrderVo data) {
+    public UpdateResult updateGoblinBackOrderVo(String backOrderId, GoblinBackOrderVo data) {
         BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
         return mongoTemplate.getCollection(GoblinBackOrderVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("backOrderId").is(backOrderId)).getQueryObject(),
@@ -517,19 +517,41 @@ public class GoblinMongoUtils {
     }
 
     //店铺总收入
-    public BigDecimal storeMoney(String storeId) {
+    public String storeMoney(String storeId, String spuId) {
+        String spuName = "店铺总收入";
         Criteria criteria = Criteria.where("status").in(GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_28.getValue()).and("storeId").is(storeId);
-
-        Aggregation aggregation = Aggregation.newAggregation(
+        Aggregation aggregation ;
+        if (spuId != null) {
+            criteria = criteria.and("spuId").is(spuId);
+            Query query = Query.query(Criteria.where("spuId").is(spuId));
+            query.fields().include("name");
+            GoblinGoodsInfoVo spuIdAndName = mongoTemplate.findOne(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+            if (spuIdAndName == null) {
+                return "," + BigDecimal.ZERO;
+            } else {
+                spuName = spuIdAndName.getName();
+            }
+            aggregation = Aggregation.newAggregation(
+                    Aggregation.match(criteria),
+                    Aggregation.group("spuId")
+                            .first("spuId").as("spuId")
+                            .first("skuPriceActual").as("skuPriceActual")
+                            .sum("skuPriceActualBig").as("skuPriceActualBig"));
+        }else{
+            aggregation = Aggregation.newAggregation(
                     Aggregation.match(criteria),
                     Aggregation.group("storeId")
                             .first("storeId").as("storeId")
                             .first("skuPriceActual").as("skuPriceActual")
-                        .sum("skuPriceActualBig").as("skuPriceActualBig")
-        );
+                            .sum("skuPriceActualBig").as("skuPriceActualBig"));
+        }
         AggregationResults<GoblinOrderLogVo> outputType = mongoTemplate.aggregate(aggregation, GoblinOrderLogVo.class.getSimpleName(), GoblinOrderLogVo.class);
         List<GoblinOrderLogVo> dataList = new ArrayList(outputType.getMappedResults());
-        return dataList.get(0).getSkuPriceActualBig();
+        if (dataList.size() > 0) {
+            return spuName + "," + dataList.get(0).getSkuPriceActualBig();
+        } else {
+            return "," + BigDecimal.ZERO;
+        }
     }
 
     //资金列表
@@ -541,7 +563,7 @@ public class GoblinMongoUtils {
         Criteria criteria = Criteria.where("status").in(GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_28.getValue()).and("storeId").is(storeId);
         if (spuName != null) {
             //根据spu名称查询spuId
-            Query query = Query.query(Criteria.where("name").regex(".*?"+spuName+".*").and("storeId").is(storeId));
+            Query query = Query.query(Criteria.where("name").regex(".*?" + spuName + ".*").and("storeId").is(storeId));
             query.fields().include("spuId").include("name");
             spuIdAndName = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
             criteria = criteria.and("spuId").in(spuIdAndName.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList()));