From 3d8ec5c23ef49d0908195c8b5b892920a46aaa8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 11:42:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
index efcbfcf..f8d2d0a 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ImportResourceStoreCmd.java
@@ -38,6 +38,7 @@
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
+import com.java110.po.resourceStoreTimes.ResourceStoreTimesPo;
import com.java110.po.resourceStoreType.ResourceStoreTypePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -93,6 +94,9 @@
@Autowired
private IResourceStoreTypeV1InnerServiceSMO resourceStoreTypeV1InnerServiceSMOImpl;
+ @Autowired
+ private IResourceStoreTimesV1InnerServiceSMO resourceStoreTimesV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
//Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -128,7 +132,7 @@
//鍒ゆ柇璧勬簮琛ㄩ噷鏄惁鏈夎鐗╁搧缂栫爜锛岄伩鍏嶇墿鍝佺紪鐮侀噸澶�
JSONObject businessResourceStore = new JSONObject();
//businessResourceStore.put("stock", "0");
- businessResourceStore.put("miniStock", "0");
+ businessResourceStore.put("miniStock", "100");
businessResourceStore.put("outLowPrice", importResourceStoreDto.getOutLowPrice());
businessResourceStore.put("outHighPrice", importResourceStoreDto.getOutHighPrice());
businessResourceStore.put("showMobile", "N");
@@ -149,10 +153,13 @@
resourceStorePo.setUnitCode(getUnitCode(importResourceStoreDto.getUnitCode(), dictDtos));
resourceStorePo.setRemark(importResourceStoreDto.getRemark());
resourceStorePo.setWarningStock(importResourceStoreDto.getWarningStock());
+ resourceStorePo.setAveragePrice(importResourceStoreDto.getPrice());
int flag = 0;
if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
resourceStorePo.setResId(GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId));
flag = resourceStoreV1InnerServiceSMOImpl.saveResourceStore(resourceStorePo);
+
+
} else {
resourceStorePo.setResId(resourceStoreDtos.get(0).getResId());
double stock = Double.parseDouble(resourceStoreDtos.get(0).getStock()) + Double.parseDouble(importResourceStoreDto.getStock());
@@ -257,10 +264,22 @@
purchaseApplyDetailPo.setRsId(resourceStorePo.getRssId());
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
+
+ // 淇濆瓨鑷� 鐗╁搧 times琛�
+ ResourceStoreTimesPo resourceStoreTimesPo = new ResourceStoreTimesPo();
+ resourceStoreTimesPo.setApplyOrderId(purchaseApplyPo.getApplyOrderId());
+ resourceStoreTimesPo.setPrice(purchaseApplyDetailPo.getPrice());
+ resourceStoreTimesPo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
+ resourceStoreTimesPo.setResCode(resourceStorePo.getResCode());
+ resourceStoreTimesPo.setStoreId(resourceStorePo.getStoreId());
+ resourceStoreTimesPo.setTimesId(GenerateCodeFactory.getGeneratorId("10"));
+ resourceStoreTimesV1InnerServiceSMOImpl.saveOrUpdateResourceStoreTimes(resourceStoreTimesPo);
}
int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
if (saveFlag < 1) {
throw new CmdException("閲囪喘鐢宠澶辫触");
}
+
+
}
}
--
Gitblit v1.8.0