From d0028c4028e0eb447f36d24f3ef9bd790eb0540c Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 16:44:39 +0800
Subject: [PATCH] 账户提现新增功能完善

---
 service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java b/service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java
old mode 100644
new mode 100755
index 5925753..c7d0d92
--- a/service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java
+++ b/service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java
@@ -5,6 +5,7 @@
 import com.java110.dto.storeOrder.StoreOrderDto;
 import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
 import com.java110.dto.storeOrderCart.StoreOrderCartDto;
+import com.java110.dto.storeOrderCartEvent.StoreOrderCartEventDto;
 import com.java110.goods.bmo.storeCart.IDeleteStoreCartBMO;
 import com.java110.goods.bmo.storeCart.IGetStoreCartBMO;
 import com.java110.goods.bmo.storeCart.ISaveStoreCartBMO;
@@ -21,6 +22,7 @@
 import com.java110.goods.bmo.storeOrderCart.IGetStoreOrderCartBMO;
 import com.java110.goods.bmo.storeOrderCart.ISaveStoreOrderCartBMO;
 import com.java110.goods.bmo.storeOrderCart.IUpdateStoreOrderCartBMO;
+import com.java110.goods.bmo.storeOrderCartEvent.IGetStoreOrderCartEventBMO;
 import com.java110.po.storeCart.StoreCartPo;
 import com.java110.po.storeOrder.StoreOrderPo;
 import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
@@ -30,6 +32,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -85,6 +88,9 @@
 
     @Autowired
     private IGetStoreOrderAddressBMO getStoreOrderAddressBMOImpl;
+
+    @Autowired
+    private IGetStoreOrderCartEventBMO getStoreOrderCartEventBMOImpl;
 
     /**
      * 寰俊淇濆瓨娑堟伅妯℃澘
@@ -286,6 +292,27 @@
     }
 
     /**
+     * 鍙戣揣鎺ュ彛
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /storeOrder/sendStoreOrderCart
+     * @path /app/storeOrder/sendStoreOrderCart
+     */
+    @RequestMapping(value = "/sendStoreOrderCart", method = RequestMethod.POST)
+    public ResponseEntity<String> sendStoreOrderCart(
+            @RequestHeader(value = "user-id",required = false) String userId,
+            @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "orderId", "璇锋眰鎶ユ枃涓湭鍖呭惈orderId");
+        Assert.hasKeyAndValue(reqJson, "cartId", "cartId涓嶈兘涓虹┖");
+
+
+        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
+        return updateStoreOrderCartBMOImpl.sendOrderCart(storeOrderCartPo,userId);
+    }
+
+    /**
      * 寰俊鍒犻櫎娑堟伅妯℃澘
      *
      * @param reqJson
@@ -313,11 +340,19 @@
      */
     @RequestMapping(value = "/queryStoreOrderCart", method = RequestMethod.GET)
     public ResponseEntity<String> queryStoreOrderCart(
+            @RequestHeader(value = "store-id", required = false) String storeId,
+            @RequestParam(value = "personId", required = false) String personId,
+            @RequestParam(value = "state", required = false) String state,
+            @RequestParam(value = "cartId", required = false) String cartId,
             @RequestParam(value = "page") int page,
             @RequestParam(value = "row") int row) {
         StoreOrderCartDto storeOrderCartDto = new StoreOrderCartDto();
         storeOrderCartDto.setPage(page);
         storeOrderCartDto.setRow(row);
+        storeOrderCartDto.setStoreId(storeId);
+        storeOrderCartDto.setPersonId(personId);
+        storeOrderCartDto.setState(state);
+        storeOrderCartDto.setCartId(cartId);
         return getStoreOrderCartBMOImpl.get(storeOrderCartDto);
     }
 
@@ -404,4 +439,25 @@
         storeOrderAddressDto.setOrderId(orderId);
         return getStoreOrderAddressBMOImpl.get(storeOrderAddressDto);
     }
+
+    /**
+     * 寰俊鍒犻櫎娑堟伅妯℃澘
+     *
+     * @param cartId 璐墿杞D
+     * @return
+     * @serviceCode /storeOrder/queryStoreOrderCartEvent
+     * @path /app/storeOrder/queryStoreOrderCartEvent
+     */
+    @RequestMapping(value = "/queryStoreOrderCartEvent", method = RequestMethod.GET)
+    public ResponseEntity<String> queryStoreOrderCartEvent(@RequestParam(value = "cartId") String cartId,
+                                                           @RequestParam(value = "orderId") String orderId,
+                                                           @RequestParam(value = "page") int page,
+                                                           @RequestParam(value = "row") int row) {
+        StoreOrderCartEventDto storeOrderCartEventDto = new StoreOrderCartEventDto();
+        storeOrderCartEventDto.setPage(page);
+        storeOrderCartEventDto.setRow(row);
+        storeOrderCartEventDto.setCartId(cartId);
+        storeOrderCartEventDto.setOrderId(orderId);
+        return getStoreOrderCartEventBMOImpl.get(storeOrderCartEventDto);
+    }
 }

--
Gitblit v1.8.0