From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
index 17e69bb..a0407de 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
@@ -48,6 +48,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -117,6 +118,7 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Autowired
private IResourceStoreTimesV1InnerServiceSMO resourceStoreTimesV1InnerServiceSMOImpl;
@@ -134,7 +136,6 @@
Assert.hasKeyAndValue(reqJson, "price", "蹇呭～锛岃濉啓鐗╁搧浠锋牸");
Assert.hasKeyAndValue(reqJson, "shId", "蹇呭～锛岃濉啓浠撳簱");
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯");
-
//鑾峰彇鏈�浣庢敹璐规爣鍑�
double outLowPrice = Double.parseDouble(reqJson.getString("outLowPrice"));
//鑾峰彇鏈�楂樻敹璐规爣鍑�
@@ -142,7 +143,6 @@
if (outLowPrice > outHighPrice) {
throw new IllegalArgumentException("鏈�浣庢敹璐规爣鍑嗕笉鑳藉ぇ浜庢渶楂樻敹璐规爣鍑嗭紒");
}
-
String resCode = reqJson.getString("resCode");
String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
//鏍规嵁鐗╁搧缂栫爜鏌ヨ鐗╁搧璧勬簮琛�
@@ -152,7 +152,6 @@
List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
//鍒ゆ柇璧勬簮琛ㄩ噷鏄惁鏈夎鐗╁搧缂栫爜锛岄伩鍏嶇墿鍝佺紪鐮侀噸澶�
Assert.listIsNull(resourceStoreDtos, "鐗╁搧缂栫爜閲嶅锛岃閲嶆柊娣诲姞锛�");
-
}
@Override
@@ -164,7 +163,15 @@
businessResourceStore.putAll(reqJson);
businessResourceStore.put("resId", GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId));
// businessResourceStore.put("stock", "0");
- businessResourceStore.put("miniStock", "0");
+ if (!StringUtil.isEmpty(reqJson.getString("stock")) && !StringUtil.isEmpty(reqJson.getString("miniUnitStock"))) {
+ double stock = Double.parseDouble(reqJson.getString("stock"));
+ double miniUnitStock = Double.parseDouble(reqJson.getString("miniUnitStock"));
+ double miniStock = stock * miniUnitStock;
+ DecimalFormat decimalFormat = new DecimalFormat("#.##");
+ businessResourceStore.put("miniStock", decimalFormat.format(miniStock));
+ } else {
+ businessResourceStore.put("miniStock", "0");
+ }
businessResourceStore.put("createTime", new Date());
ResourceStorePo resourceStorePo = BeanConvertUtil.covertBean(businessResourceStore, ResourceStorePo.class);
if (StringUtil.isEmpty(resourceStorePo.getAveragePrice())) {
@@ -175,10 +182,8 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
-
//todo 鍏ュ簱
inStore(reqJson, userId, storeId, resourceStorePo);
-
//灏嗗浘鐗囨彃鍏ユ枃浠惰〃閲�
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setObjId(resourceStorePo.getResId());
@@ -211,17 +216,14 @@
* @param storeId
*/
private void inStore(JSONObject reqJson, String userId, String storeId, ResourceStorePo resourceStorePo) {
-
UserDto userDto = new UserDto();
userDto.setUserId(userId);
userDto.setPage(1);
userDto.setRow(1);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
-
Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
-
String applyOrderId = "-1";
- int stock = Integer.parseInt(resourceStorePo.getStock());
+ double stock = Double.parseDouble(resourceStorePo.getStock());
//todo 濡傛灉鏈夊簱瀛樻墠鐢熸垚 閲囪喘娴佺▼
if (stock > 0) {
applyOrderId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId);
@@ -242,7 +244,6 @@
purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));
//鑾峰彇閲囪喘鐗╁搧淇℃伅
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
-
PurchaseApplyDetailPo purchaseApplyDetailPo = new PurchaseApplyDetailPo();
purchaseApplyDetailPo.setApplyOrderId(applyOrderId);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
@@ -260,7 +261,6 @@
throw new CmdException("閲囪喘鐢宠澶辫触");
}
}
-
// 淇濆瓨鑷� 鐗╁搧 times琛�
ResourceStoreTimesPo resourceStoreTimesPo = new ResourceStoreTimesPo();
resourceStoreTimesPo.setApplyOrderId(applyOrderId);
@@ -271,9 +271,6 @@
resourceStoreTimesPo.setTimesId(GenerateCodeFactory.getGeneratorId("10"));
resourceStoreTimesPo.setShId(resourceStorePo.getShId());
resourceStoreTimesPo.setCommunityId(reqJson.getString("communityId"));
-
resourceStoreTimesV1InnerServiceSMOImpl.saveOrUpdateResourceStoreTimes(resourceStoreTimesPo);
-
-
}
}
--
Gitblit v1.8.0