Merge remote-tracking branch 'origin/master' into xinghong-dev

java110-bean/src/main/java/com/java110/vo/api/smallWeChat/ApiSmallWeChatDataVo.java

@@ -22,6 +22,7 @@ public class ApiSmallWeChatDataVo implements Serializable {
     private String mchId;
     private String objTypeName;
     private String wId;
+    private String certPath;
 
     public String getOperate() {
         return operate;
@@ -161,4 +162,20 @@ public class ApiSmallWeChatDataVo implements Serializable {
     public void setwId(String wId) {
         this.wId = wId;
     }
+
+    public String getWechatId() {
+        return wechatId;
+    }
+
+    public void setWechatId(String wechatId) {
+        this.wechatId = wechatId;
+    }
+
+    public String getCertPath() {
+        return certPath;
+    }
+
+    public void setCertPath(String certPath) {
+        this.certPath = certPath;
+    }
 }

service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java

@@ -60,7 +60,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
             int ftpPort = Integer.parseInt(MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PORT));
             String ftpUserName = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERNAME);
             String ftpUserPassword = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERPASSWORD);
-            String ftpPath = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PATH);
+            String ftpPath = java110Properties.getFtpPath();
             fileName = ftpUploadTemplate.upload(fileDto.getContext(), ftpServer,
                     ftpPort, ftpUserName,
                     ftpUserPassword, ftpPath);

service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java

@@ -11,6 +11,7 @@ import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO;
 import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
 import com.java110.intf.order.IOrderInnerServiceSMO;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
+import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.po.onlinePay.OnlinePayPo;
 import com.java110.utils.cache.MappingCache;
@@ -59,7 +60,7 @@ public class ReturnPayFeeMoneyAdapt extends DatabusAdaptImpl {
 
 
     @Autowired
-    private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
+    private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;
 
 
     @Autowired
@@ -112,13 +113,13 @@ public class ReturnPayFeeMoneyAdapt extends DatabusAdaptImpl {
         SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
         smallWeChatDto.setMchId(onlinePayDtos.get(0).getMchId());
         smallWeChatDto.setAppId(onlinePayDtos.get(0).getAppId());
-        List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
+        List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
         if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
             payPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
             certData = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "cert");
         } else {
             payPassword = smallWeChatDtos.get(0).getPayPassword();
-            certData = smallWeChatDtos.get(0).getRemarks();
+            certData = smallWeChatDtos.get(0).getCertPath();
 
         }
 

service-store/src/main/java/com/java110/store/api/PurchaseApi.java

@@ -267,7 +267,12 @@ public class PurchaseApi {
             //查询当前小区仓库下该物品信息
             ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
             resourceStoreDto.setResCode(resourceStore.getString("resCode"));
-            resourceStoreDto.setShId(resourceStore.getString("shzId"));//小区目标仓库
+
+            if (StringUtil.isEmpty(resourceStore.getString("shzId"))) {
+                resourceStore.put("shzId", resourceStore.getString("shId"));
+            }
+            resourceStoreDto.setShId(resourceStore.getString("shzId")); //小区目标仓库
+
             List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
             //调整集团仓库物品信息
             ResourceStorePo resourceStorePo = new ResourceStorePo();

service-store/src/main/java/com/java110/store/cmd/smallWechat/ListSmallWechatCmd.java

@@ -17,20 +17,15 @@ package com.java110.store.cmd.smallWechat;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.app.AppDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
-import com.java110.po.smallWechat.SmallWechatPo;
 import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
 import com.java110.vo.api.smallWeChat.ApiSmallWeChatDataVo;
 import com.java110.vo.api.smallWeChat.ApiSmallWeChatVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,9 +49,9 @@ import org.slf4j.LoggerFactory;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @Java110Cmd(serviceCode = "smallWeChat.listSmallWeChats")
-public class ListSmallWechatCmd extends AbstractServiceCmdListener {
+public class ListSmallWeChatsCmd extends AbstractServiceCmdListener {
 
-  private static Logger logger = LoggerFactory.getLogger(ListSmallWechatCmd.class);
+  private static Logger logger = LoggerFactory.getLogger(ListSmallWeChatsCmd.class);
     @Autowired
     private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;
 

service-store/src/main/java/com/java110/store/cmd/smallWechat/SaveSmallWechatCmd.java

@@ -85,7 +85,7 @@ public class SaveSmallWechatCmd extends AbstractServiceCmdListener {
         reqJson.put("wechatId", wechatId);
         reqJson.put("objType", SmallWeChatDto.OBJ_TYPE_COMMUNITY);
         SmallWechatPo smallWechatPo = BeanConvertUtil.covertBean(reqJson, SmallWechatPo.class);
-        smallWechatPo.setWechatId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        smallWechatPo.setWechatId(wechatId);
         smallWechatPo.setWechatType(reqJson.getString("weChatType"));
         int flag = smallWechatV1InnerServiceSMOImpl.saveSmallWechat(smallWechatPo);