From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java | 220 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 189 insertions(+), 31 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 7626e34..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
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.storeCart.StoreCartDto;
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;
@@ -12,20 +14,34 @@
import com.java110.goods.bmo.storeOrder.IGetStoreOrderBMO;
import com.java110.goods.bmo.storeOrder.ISaveStoreOrderBMO;
import com.java110.goods.bmo.storeOrder.IUpdateStoreOrderBMO;
+import com.java110.goods.bmo.storeOrderAddress.IDeleteStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.IGetStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.ISaveStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.IUpdateStoreOrderAddressBMO;
import com.java110.goods.bmo.storeOrderCart.IDeleteStoreOrderCartBMO;
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;
import com.java110.po.storeOrderCart.StoreOrderCartPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+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;
+import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 鍟嗘埛璁㈠崟
+ * add by wuxw 2020-11-15
+ */
@RestController
@RequestMapping(value = "/storeOrder")
public class StoreOrderApi {
@@ -62,6 +78,20 @@
@Autowired
private IGetStoreOrderCartBMO getStoreOrderCartBMOImpl;
+
+ @Autowired
+ private ISaveStoreOrderAddressBMO saveStoreOrderAddressBMOImpl;
+ @Autowired
+ private IUpdateStoreOrderAddressBMO updateStoreOrderAddressBMOImpl;
+ @Autowired
+ private IDeleteStoreOrderAddressBMO deleteStoreOrderAddressBMOImpl;
+
+ @Autowired
+ private IGetStoreOrderAddressBMO getStoreOrderAddressBMOImpl;
+
+ @Autowired
+ private IGetStoreOrderCartEventBMO getStoreOrderCartEventBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -75,12 +105,12 @@
Assert.hasKeyAndValue(reqJson, "personId", "璇锋眰鎶ユ枃涓湭鍖呭惈personId");
Assert.hasKeyAndValue(reqJson, "personName", "璇锋眰鎶ユ枃涓湭鍖呭惈personName");
- Assert.hasKeyAndValue(reqJson, "totalPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈totalPrice");
- Assert.hasKeyAndValue(reqJson, "payPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈payPrice");
-
+ Assert.hasKeyAndValue(reqJson, "addressId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏀惰揣浜轰俊鎭�");
+ Assert.hasKey(reqJson, "goodsList", "鏈寘鍚晢鍝佷俊鎭�");
StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
- return saveStoreOrderBMOImpl.save(storeOrderPo);
+ return saveStoreOrderBMOImpl.save(storeOrderPo, reqJson.getJSONArray("goodsList"),
+ reqJson.getString("addressId"));
}
/**
@@ -94,12 +124,7 @@
@RequestMapping(value = "/updateStoreOrder", method = RequestMethod.POST)
public ResponseEntity<String> updateStoreOrder(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "personId", "璇锋眰鎶ユ枃涓湭鍖呭惈personId");
- Assert.hasKeyAndValue(reqJson, "personName", "璇锋眰鎶ユ枃涓湭鍖呭惈personName");
- Assert.hasKeyAndValue(reqJson, "totalPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈totalPrice");
- Assert.hasKeyAndValue(reqJson, "payPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈payPrice");
- Assert.hasKeyAndValue(reqJson, "orderId", "orderId涓嶈兘涓虹┖");
-
+ Assert.hasKeyAndValue(reqJson, "orderId", "璇锋眰鎶ユ枃涓湭鍖呭惈orderId");
StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
return updateStoreOrderBMOImpl.update(storeOrderPo);
@@ -147,8 +172,8 @@
*
* @param reqJson
* @return
- * @serviceCode /storeCart/saveStoreCart
- * @path /app/storeCart/saveStoreCart
+ * @serviceCode /storeOrder/saveStoreCart
+ * @path /app/storeOrder/saveStoreCart
*/
@RequestMapping(value = "/saveStoreCart", method = RequestMethod.POST)
public ResponseEntity<String> saveStoreCart(@RequestBody JSONObject reqJson) {
@@ -168,8 +193,8 @@
*
* @param reqJson
* @return
- * @serviceCode /storeCart/updateStoreCart
- * @path /app/storeCart/updateStoreCart
+ * @serviceCode /storeOrder/updateStoreCart
+ * @path /app/storeOrder/updateStoreCart
*/
@RequestMapping(value = "/updateStoreCart", method = RequestMethod.POST)
public ResponseEntity<String> updateStoreCart(@RequestBody JSONObject reqJson) {
@@ -190,8 +215,8 @@
*
* @param reqJson
* @return
- * @serviceCode /storeCart/deleteStoreCart
- * @path /app/storeCart/deleteStoreCart
+ * @serviceCode /storeOrder/deleteStoreCart
+ * @path /app/storeOrder/deleteStoreCart
*/
@RequestMapping(value = "/deleteStoreCart", method = RequestMethod.POST)
public ResponseEntity<String> deleteStoreCart(@RequestBody JSONObject reqJson) {
@@ -207,19 +232,18 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
- * @param communityId 灏忓尯ID
* @return
- * @serviceCode /storeCart/queryStoreCart
- * @path /app/storeCart/queryStoreCart
+ * @serviceCode /storeOrder/queryStoreCart
+ * @path /app/storeOrder/queryStoreCart
*/
@RequestMapping(value = "/queryStoreCart", method = RequestMethod.GET)
- public ResponseEntity<String> queryStoreCart(@RequestParam(value = "communityId") String communityId,
+ public ResponseEntity<String> queryStoreCart(@RequestParam(value = "personId", required = false) String personId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
StoreCartDto storeCartDto = new StoreCartDto();
storeCartDto.setPage(page);
storeCartDto.setRow(row);
- //storeCartDto.setCommunityId(communityId);
+ storeCartDto.setPersonId(personId);
return getStoreCartBMOImpl.get(storeCartDto);
}
@@ -229,8 +253,8 @@
*
* @param reqJson
* @return
- * @serviceCode /storeOrderCart/saveStoreOrderCart
- * @path /app/storeOrderCart/saveStoreOrderCart
+ * @serviceCode /storeOrder/saveStoreOrderCart
+ * @path /app/storeOrder/saveStoreOrderCart
*/
@RequestMapping(value = "/saveStoreOrderCart", method = RequestMethod.POST)
public ResponseEntity<String> saveStoreOrderCart(@RequestBody JSONObject reqJson) {
@@ -250,8 +274,8 @@
*
* @param reqJson
* @return
- * @serviceCode /storeOrderCart/updateStoreOrderCart
- * @path /app/storeOrderCart/updateStoreOrderCart
+ * @serviceCode /storeOrder/updateStoreOrderCart
+ * @path /app/storeOrder/updateStoreOrderCart
*/
@RequestMapping(value = "/updateStoreOrderCart", method = RequestMethod.POST)
public ResponseEntity<String> updateStoreOrderCart(@RequestBody JSONObject reqJson) {
@@ -268,12 +292,33 @@
}
/**
+ * 鍙戣揣鎺ュ彛
+ *
+ * @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
* @return
- * @serviceCode /storeOrderCart/deleteStoreOrderCart
- * @path /app/storeOrderCart/deleteStoreOrderCart
+ * @serviceCode /storeOrder/deleteStoreOrderCart
+ * @path /app/storeOrder/deleteStoreOrderCart
*/
@RequestMapping(value = "/deleteStoreOrderCart", method = RequestMethod.POST)
public ResponseEntity<String> deleteStoreOrderCart(@RequestBody JSONObject reqJson) {
@@ -290,16 +335,129 @@
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
* @return
- * @serviceCode /storeOrderCart/queryStoreOrderCart
- * @path /app/storeOrderCart/queryStoreOrderCart
+ * @serviceCode /storeOrder/queryStoreOrderCart
+ * @path /app/storeOrder/queryStoreOrderCart
*/
@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);
}
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /storeOrder/saveStoreOrderAddress
+ * @path /app/storeOrder/saveStoreOrderAddress
+ */
+ @RequestMapping(value = "/saveStoreOrderAddress", method = RequestMethod.POST)
+ public ResponseEntity<String> saveStoreOrderAddress(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "orderId", "璇锋眰鎶ユ枃涓湭鍖呭惈orderId");
+ Assert.hasKeyAndValue(reqJson, "areaCode", "璇锋眰鎶ユ枃涓湭鍖呭惈areaCode");
+ Assert.hasKeyAndValue(reqJson, "tel", "璇锋眰鎶ユ枃涓湭鍖呭惈tel");
+ Assert.hasKeyAndValue(reqJson, "address", "璇锋眰鎶ユ枃涓湭鍖呭惈address");
+ Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈username");
+
+
+ StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+ return saveStoreOrderAddressBMOImpl.save(storeOrderAddressPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /storeOrder/updateStoreOrderAddress
+ * @path /app/storeOrder/updateStoreOrderAddress
+ */
+ @RequestMapping(value = "/updateStoreOrderAddress", method = RequestMethod.POST)
+ public ResponseEntity<String> updateStoreOrderAddress(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "orderId", "璇锋眰鎶ユ枃涓湭鍖呭惈orderId");
+ Assert.hasKeyAndValue(reqJson, "areaCode", "璇锋眰鎶ユ枃涓湭鍖呭惈areaCode");
+ Assert.hasKeyAndValue(reqJson, "tel", "璇锋眰鎶ユ枃涓湭鍖呭惈tel");
+ Assert.hasKeyAndValue(reqJson, "address", "璇锋眰鎶ユ枃涓湭鍖呭惈address");
+ Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈username");
+ Assert.hasKeyAndValue(reqJson, "oaId", "oaId涓嶈兘涓虹┖");
+
+
+ StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+ return updateStoreOrderAddressBMOImpl.update(storeOrderAddressPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /storeOrder/deleteStoreOrderAddress
+ * @path /app/storeOrder/deleteStoreOrderAddress
+ */
+ @RequestMapping(value = "/deleteStoreOrderAddress", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteStoreOrderAddress(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "oaId", "oaId涓嶈兘涓虹┖");
+
+
+ StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+ return deleteStoreOrderAddressBMOImpl.delete(storeOrderAddressPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param orderId 璁㈠崟ID
+ * @return
+ * @serviceCode /storeOrder/queryStoreOrderAddress
+ * @path /app/storeOrder/queryStoreOrderAddress
+ */
+ @RequestMapping(value = "/queryStoreOrderAddress", method = RequestMethod.GET)
+ public ResponseEntity<String> queryStoreOrderAddress(@RequestParam(value = "orderId") String orderId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ StoreOrderAddressDto storeOrderAddressDto = new StoreOrderAddressDto();
+ storeOrderAddressDto.setPage(page);
+ storeOrderAddressDto.setRow(row);
+ 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