From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateStorehouseCmd.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateStorehouseCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateStorehouseCmd.java
index 9ba5e35..31e8c63 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateStorehouseCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateStorehouseCmd.java
@@ -18,6 +18,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -55,9 +56,19 @@
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "shId", "shId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "shName", "璇锋眰鎶ユ枃涓湭鍖呭惈shName");
- Assert.hasKeyAndValue(reqJson, "shType", "璇锋眰鎶ユ枃涓湭鍖呭惈shType");
- Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+ reqJson.put("storeId", storeId);
+ if ("ON".equals(reqJson.getString("purchaseSwitch"))) {
+ Assert.hasKeyAndValue(reqJson, "purchaseRafId", "璇锋眰鎶ユ枃涓湭鍖呭惈閲囪喘娴佺▼");
+ }
+ if ("ON".equals(reqJson.getString("useSwitch"))) {
+ Assert.hasKeyAndValue(reqJson, "useRafId", "璇锋眰鎶ユ枃涓湭鍖呭惈棰嗙敤娴佺▼");
+ }
+
+ if ("ON".equals(reqJson.getString("allocationSwitch"))) {
+ Assert.hasKeyAndValue(reqJson, "allocationRafId", "璇锋眰鎶ユ枃涓湭鍖呭惈璋冩嫧娴佺▼");
+ }
}
@Override
--
Gitblit v1.8.0