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/bmo/storeOrder/impl/SaveStoreOrderBMOImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/service-goods/src/main/java/com/java110/goods/bmo/storeOrder/impl/SaveStoreOrderBMOImpl.java b/service-goods/src/main/java/com/java110/goods/bmo/storeOrder/impl/SaveStoreOrderBMOImpl.java
old mode 100644
new mode 100755
index 5126ad3..2dab842
--- a/service-goods/src/main/java/com/java110/goods/bmo/storeOrder/impl/SaveStoreOrderBMOImpl.java
+++ b/service-goods/src/main/java/com/java110/goods/bmo/storeOrder/impl/SaveStoreOrderBMOImpl.java
@@ -11,18 +11,20 @@
import com.java110.dto.storeOrderCart.StoreOrderCartDto;
import com.java110.dto.userAddress.UserAddressDto;
import com.java110.goods.bmo.storeOrder.ISaveStoreOrderBMO;
-import com.java110.intf.goods.IStoreOrderAddressInnerServiceSMO;
-import com.java110.intf.goods.IStoreOrderCartInnerServiceSMO;
-import com.java110.intf.goods.IStoreOrderInnerServiceSMO;
-import com.java110.intf.user.IUserAddressInnerServiceSMO;
import com.java110.intf.goods.IGroupBuyProductSpecInnerServiceSMO;
import com.java110.intf.goods.IProductInnerServiceSMO;
import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
+import com.java110.intf.goods.IStoreOrderAddressInnerServiceSMO;
+import com.java110.intf.goods.IStoreOrderCartEventInnerServiceSMO;
+import com.java110.intf.goods.IStoreOrderCartInnerServiceSMO;
+import com.java110.intf.goods.IStoreOrderInnerServiceSMO;
+import com.java110.intf.user.IUserAddressInnerServiceSMO;
import com.java110.po.groupBuyProductSpec.GroupBuyProductSpecPo;
import com.java110.po.productSpecValue.ProductSpecValuePo;
import com.java110.po.storeOrder.StoreOrderPo;
import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
import com.java110.po.storeOrderCart.StoreOrderCartPo;
+import com.java110.po.storeOrderCartEvent.StoreOrderCartEventPo;
import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
@@ -58,6 +60,9 @@
@Autowired
private IStoreOrderAddressInnerServiceSMO storeOrderAddressInnerServiceSMOImpl;
+ @Autowired
+ private IStoreOrderCartEventInnerServiceSMO storeOrderCartEventInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -67,7 +72,7 @@
* cartId:"123",//娌℃湁鍐�-1
* productId:"浜у搧ID",
* valueId:"浜у搧瑙勬牸ID",
- * cartNum:1,//璐拱鏁伴噺
+ * goodsNum:1,//璐拱鏁伴噺
* storeId:"浜у搧鍟嗘埛ID",
* <p>
* }
@@ -141,7 +146,7 @@
Assert.hasKeyAndValue(goods, "cartId", "鏈寘鍚喘鐗╄溅ID");
Assert.hasKeyAndValue(goods, "productId", "鏈寘鍚晢鍝�");
Assert.hasKeyAndValue(goods, "valueId", "鏈寘鍚晢鍝佽鏍�");
- Assert.hasKeyAndValue(goods, "cartNum", "鏈寘鍚晢鍝佹暟閲�");
+ Assert.hasKeyAndValue(goods, "goodsNum", "鏈寘鍚晢鍝佹暟閲�");
Assert.hasKeyAndValue(goods, "storeId", "鏈寘鍚晢鎴�");
int flag = 0;
@@ -159,15 +164,15 @@
DistributedLock.releaseDistributedLock(requestId, key);
}
- if (goods.getString("carId").startsWith("-")) {
- goods.put("carId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_cartId));
+ if (goods.getString("cartId").startsWith("-")) {
+ goods.put("cartId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_cartId));
}
String payPrice = groupBuyProductSpecDto == null ? productSpecValueDto.getPrice() : groupBuyProductSpecDto.getGroupPrice();
StoreOrderCartPo storeOrderCartPo = new StoreOrderCartPo();
- storeOrderCartPo.setCartId(goods.getString("carId"));
- storeOrderCartPo.setCartNum(goods.getString("cartNum"));
+ storeOrderCartPo.setCartId(goods.getString("cartId"));
+ storeOrderCartPo.setCartNum(goods.getString("goodsNum"));
storeOrderCartPo.setFreightPrice("0");
storeOrderCartPo.setOrderId(storeOrderPo.getOrderId());
storeOrderCartPo.setPayPrice(payPrice);
@@ -184,6 +189,20 @@
throw new IllegalArgumentException("淇濆瓨璐墿杞﹀け璐�");
}
+ StoreOrderCartEventPo storeOrderCartEventPo = new StoreOrderCartEventPo();
+ storeOrderCartEventPo.setCartId(storeOrderCartPo.getCartId());
+ storeOrderCartEventPo.setOrderId(storeOrderCartPo.getOrderId());
+ storeOrderCartEventPo.setEventId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_eventId));
+ storeOrderCartEventPo.setEventObjType("U");
+ storeOrderCartEventPo.setEventObjId(storeOrderPo.getPersonId());
+ storeOrderCartEventPo.setEventMsg("鐢ㄦ埛涓嬪崟");
+
+ flag = storeOrderCartEventInnerServiceSMOImpl.saveStoreOrderCartEvent(storeOrderCartEventPo);
+
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇濆瓨璐墿杞︿簨浠跺け璐�");
+ }
+
BigDecimal orderPayPrice = new BigDecimal(Double.parseDouble(storeOrderPo.getPayPrice()));
double oPayPrice = orderPayPrice.add(new BigDecimal(Double.parseDouble(payPrice))).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
--
Gitblit v1.8.0