Lianxun_Java.git

			@@ -4,20 +4,18 @@
			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;
			import com.java110.core.event.cmd.CmdEvent;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.resourceStore.ResourceStoreDto;
			import com.java110.dto.resource.ResourceStoreDto;
			import com.java110.dto.user.UserDto;
			import com.java110.dto.userStorehouse.UserStorehouseDto;
			import com.java110.dto.user.UserStorehouseDto;
			import com.java110.intf.store.*;
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.allocationUserStorehouse.AllocationUserStorehousePo;
			import com.java110.po.resourceStoreUseRecord.ResourceStoreUseRecordPo;
			import com.java110.po.userStorehouse.UserStorehousePo;
			import com.java110.utils.constant.BusinessTypeConstant;
			import com.java110.po.purchase.AllocationUserStorehousePo;
			import com.java110.po.resource.ResourceStoreUseRecordPo;
			import com.java110.po.user.UserStorehousePo;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			@@ -65,6 +63,9 @@
			@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);
			@@ -193,6 +194,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();
			@@ -292,6 +295,7 @@
			userStorePo.setStock(String.valueOf(stockNumber));
			}
			userStorePo.setUsId(userStorehouses.get(0).getUsId());
			userStorePo.setTimesId(timesId);
			//更新当前用户的库存数量
			flag1 = userStorehouseV1InnerServiceSMOImpl.updateUserStorehouse(userStorePo);
			if(flag1 <1){
			@@ -318,6 +322,7 @@
			}
			userStorePo.setMiniStock(giveQuantity);
			userStorePo.setUserId(acceptUserId);
			userStorePo.setTimesId(timesId);
			//保存接受转赠用户个人物品信息
			flag1 = userStorehouseV1InnerServiceSMOImpl.saveUserStorehouse(userStorePo);
			if(flag1 <1){