代码提交

src/main/java/com/wechat/common/entity/merchant/RegisterMerchant/RegisterMerchant.java

@@ -81,6 +81,7 @@ public class RegisterMerchant {
 	//小程序信息
 	//private MiniProgramInformation miniProgramInformation;
 	
+	//服务商小程序
 	private String miniProgramAppid;
 	
 	//商家主体一致且已认证的小程序APPID
@@ -91,9 +92,10 @@ public class RegisterMerchant {
 		2、请填写通过图片上传接口预先上传图片生成好的MediaID。 
 		首次提交未成功进件，二次提交时必填
 	 */
+	//小程序MediaID
 	private List<String> miniProgramPicsMediaID;
 	
-	//图片url
+	//小程序图片url
 	private List<String> miniProgramPicsUrl;
 	
 	//结算规则id

src/main/java/com/wechat/common/entity/merchant/bank_account_info/BankAccountInfo.java

@@ -9,6 +9,7 @@ import javax.crypto.IllegalBlockSizeException;
 
 import com.wechat.common.entity.merchant.WeChatMerchant;
 import com.wechat.common.entity.merchant.RegisterMerchant.RegisterMerchant;
+import com.wechat.common.util.StringUtil;
 import com.wechat.common.util.serial.WechatpaySerial;
 
 public class BankAccountInfo {
@@ -143,7 +144,9 @@ public class BankAccountInfo {
 		this.setBank_branch_id(registerMerchant.getBankBranchId());
 		try {
 			this.setAccount_bank(URLDecoder.decode(registerMerchant.getAccountBank(),"UTF-8"));
-			this.setBank_name(URLDecoder.decode(registerMerchant.getBankName(),"UTF-8"));
+			if(!StringUtil.isEmpty(registerMerchant.getBankName())){
+				this.setBank_name(URLDecoder.decode(registerMerchant.getBankName(),"UTF-8"));
+			}
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

src/main/java/com/wechat/controller/merchant/MerchantController.java

@@ -31,7 +31,7 @@ public class MerchantController extends BaseController{
 	} 
 	
 	/**
-	 * 根据申请单号查询本系统入驻状态
+	 * 根据申请单号查询本系统入驻状态 -- 外部系统调用
 	 * @param businessCode 申请单号
 	 * @return
 	 */
@@ -41,7 +41,7 @@ public class MerchantController extends BaseController{
 	} 
 	
 	/**
-	 * 根据业务申请编号查询入驻状态
+	 * 根据业务申请编号查询入驻状态  -- 调用微信查询状态
 	 * @param businessCode 业务申请编号
 	 * @return
 	 */

src/main/java/com/wechat/service/merchant/impl/MerchantServiceImpl.java

@@ -89,8 +89,7 @@ public class MerchantServiceImpl implements MerchantService {
 
 			String body = JSONObject.toJSONString(wm);
 			// 获取签名
-			String auth = ComtikaWeChatUtil.findAuthorization("POST",
-					"/v3/applyment4sub/applyment/", body);
+			String auth = ComtikaWeChatUtil.findAuthorization("POST","/v3/applyment4sub/applyment/", body);
 
 			map.put("Charsert", "UTF-8");
 			map.put("connection", "Keep-Alive");
@@ -98,11 +97,11 @@ public class MerchantServiceImpl implements MerchantService {
 			map.put("Content-Type", "application/json");
 			map.put("Accept", "application/json");
 			map.put("Authorization", auth);
-			System.out.println(body);
+System.out.println(body);
 			String data = "";
 			try {
-				//data = "{\"applyment_id\":2000002138689059}";
-				data = HTTPUtils.post("https://api.mch.weixin.qq.com/v3/applyment4sub/applyment/",map,body);
+				data = "{\"applyment_id\":2000002138689059111}";
+				//data = HTTPUtils.post("https://api.mch.weixin.qq.com/v3/applyment4sub/applyment/",map,body);
 			} catch (Exception e) {
 				e.printStackTrace();
 				data = e.getMessage();