From a6c962f1c6e14984f2bbc2f3e43fa85947d3cb0a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 25 三月 2023 00:26:41 +0800
Subject: [PATCH] 支持厂拍门禁
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
index 39ef76f..34b87ce 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
@@ -61,8 +62,12 @@
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
String userId = reqJson.getString("userId");
+ if(StringUtil.isEmpty(userId)){
+ userId = context.getReqHeaders().get("user-id");
+ }
UserDto userDto = new UserDto();
userDto.setUserId(userId);
userDto.setPage(1);
@@ -191,6 +196,8 @@
String acceptUserId = paramInJson.getString("acceptUserId");
//鑾峰彇鎺ュ彈杞禒鐢ㄦ埛鍚嶇О
String acceptUserName = paramInJson.getString("acceptUserName");
+ //鎵规
+ String timesId = paramIn.getString("timesId");
//鑾峰彇鍟嗘埛id
String storeId = paramInJson.getString("storeId");
JSONObject allocationUserStorehouseJson = new JSONObject();
@@ -290,6 +297,7 @@
userStorePo.setStock(String.valueOf(stockNumber));
}
userStorePo.setUsId(userStorehouses.get(0).getUsId());
+ userStorePo.setTimesId(timesId);
//鏇存柊褰撳墠鐢ㄦ埛鐨勫簱瀛樻暟閲�
flag1 = userStorehouseV1InnerServiceSMOImpl.updateUserStorehouse(userStorePo);
if(flag1 <1){
@@ -316,8 +324,9 @@
}
userStorePo.setMiniStock(giveQuantity);
userStorePo.setUserId(acceptUserId);
+ userStorePo.setTimesId(timesId);
//淇濆瓨鎺ュ彈杞禒鐢ㄦ埛涓汉鐗╁搧淇℃伅
- flag1 = userStorehouseV1InnerServiceSMOImpl.updateUserStorehouse(userStorePo);
+ flag1 = userStorehouseV1InnerServiceSMOImpl.saveUserStorehouse(userStorePo);
if(flag1 <1){
throw new CmdException("淇濆瓨澶辫触");
} }
--
Gitblit v1.8.0