加入 商户应用

java110-bean/src/main/java/com/java110/dto/smallWeChat/SmallWeChatDto.java

@@ -21,6 +21,7 @@ public class SmallWeChatDto extends PageDto implements Serializable {
     public static final String WECHAT_TYPE_PUBLIC ="1100";
 
     private String mchId;
+    private String mchName;
     private String storeId;
     private String wechatType;
     private String weChatType;
@@ -197,4 +198,12 @@ public class SmallWeChatDto extends PageDto implements Serializable {
     public void setWeChatType(String weChatType) {
         this.weChatType = weChatType;
     }
+
+    public String getMchName() {
+        return mchName;
+    }
+
+    public void setMchName(String mchName) {
+        this.mchName = mchName;
+    }
 }

java110-bean/src/main/java/com/java110/po/smallWechat/SmallWechatPo.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 public class SmallWechatPo implements Serializable {
 
     private String mchId;
+    private String mchName;
     private String statusCd = "0";
     private String storeId;
     private String wechatType;
@@ -146,4 +147,11 @@ public class SmallWechatPo implements Serializable {
     }
 
 
+    public String getMchName() {
+        return mchName;
+    }
+
+    public void setMchName(String mchName) {
+        this.mchName = mchName;
+    }
 }

java110-bean/src/main/java/com/java110/po/store/SmallWechatPo.java

@@ -22,6 +22,8 @@ public class SmallWechatPo implements Serializable {
     private String objId;
     private String objType;
     private String mchId;
+    private String mchName;
+
     private String weChatType;
 
     public String getWeChatId() {
@@ -111,4 +113,12 @@ public class SmallWechatPo implements Serializable {
     public void setWeChatType(String weChatType) {
         this.weChatType = weChatType;
     }
+
+    public String getMchName() {
+        return mchName;
+    }
+
+    public void setMchName(String mchName) {
+        this.mchName = mchName;
+    }
 }

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

@@ -20,6 +20,7 @@ public class ApiSmallWeChatDataVo implements Serializable {
     private String objId;
     private String objType;
     private String mchId;
+    private String mchName;
     private String objTypeName;
     private String wId;
     private String certPath;
@@ -178,4 +179,12 @@ public class ApiSmallWeChatDataVo implements Serializable {
     public void setCertPath(String certPath) {
         this.certPath = certPath;
     }
+
+    public String getMchName() {
+        return mchName;
+    }
+
+    public void setMchName(String mchName) {
+        this.mchName = mchName;
+    }
 }

java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java

@@ -122,7 +122,7 @@ public class OssUploadTemplate {
         ByteArrayInputStream fis = null;
         try {
             ossClient = OSSUtil.getOSSClient();
-            OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
+            ins = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
             byteOut = new ByteArrayOutputStream();
             byte[] buf = new byte[2048];
             int bufsize = 0;

java110-db/src/main/resources/mapper/store/SmallWechatV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存微信配置表信息 add by wuxw 2018-07-03 -->
     <insert id="saveSmallWechatInfo" parameterType="Map">
         insert into small_wechat(
-        mch_id,store_Id,wechat_type,cert_path,appId,appSecret,name,obj_id,wechat_id,pay_password,obj_type,remarks
+        mch_id,store_Id,wechat_type,cert_path,appId,appSecret,name,obj_id,wechat_id,pay_password,obj_type,remarks,mch_name
         ) values (
-        #{mchId},#{storeId},#{wechatType},#{certPath},#{appId},#{appSecret},#{name},#{objId},#{wechatId},#{payPassword},#{objType},#{remarks}
+        #{mchId},#{storeId},#{wechatType},#{certPath},#{appId},#{appSecret},#{name},#{objId},#{wechatId},#{payPassword},#{objType},#{remarks},#{mchName}
         )
     </insert>
 
@@ -21,7 +21,7 @@
         t.wechat_type wechatType,t.wechat_type weChatType,t.cert_path,t.cert_path certPath,t.appId,t.appId appid,t.appSecret,t.appSecret
         appsecret,
         t.name,t.obj_id,t.obj_id objId,t.wechat_id,t.wechat_id wechatId,t.wechat_id weChatId,t.pay_password,t.pay_password payPassword,
-        t.obj_type,t.obj_type objType,t.remarks
+        t.obj_type,t.obj_type objType,t.remarks,t.mch_name mchName
         from small_wechat t
         where 1 =1
         <if test="mchId !=null and mchId != ''">
@@ -92,6 +92,9 @@
         <if test="mchId !=null and mchId != ''">
             , t.mch_id= #{mchId}
         </if>
+        <if test="mchName !=null and mchName != ''">
+            , t.mch_name= #{mchName}
+        </if>
         <if test="storeId !=null and storeId != ''">
             , t.store_Id= #{storeId}
         </if>