yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -10,27 +10,16 @@
 
 package com.yami.shop.platform.controller;
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.enums.DvyType;
 import com.yami.shop.bean.enums.OrderStatus;
-import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderItem;
-import com.yami.shop.bean.model.User;
-import com.yami.shop.bean.model.UserAddrOrder;
-import com.yami.shop.bean.param.*;
 import com.yami.shop.bean.model.*;
-import com.yami.shop.bean.param.BackendOrderParam;
-import com.yami.shop.bean.param.DeliveryOrderParam;
-import com.yami.shop.bean.param.OrderParam;
-import com.yami.shop.bean.param.OrderPayParam;
+import com.yami.shop.bean.param.*;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
-import com.yami.shop.coupon.comment.model.Coupon;
 import com.yami.shop.security.comment.dao.AppConnectMapper;
 import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.service.*;

yami-shop-wx/src/main/java/com/yami/shop/wx/form/BankAccountInfo.java

@@ -1,31 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "结算银行账户")
-public class BankAccountInfo {
-
-    @SerializedName("bank_account_type")
-    @ApiModelProperty(value = "账户类型 BANK_ACCOUNT_TYPE_CORPORATE-对公银行账户 BANK_ACCOUNT_TYPE_PERSONAL- 经营者个人银行卡")
-    public String bankAccountType;
-
-    @SerializedName("account_name")
-    @ApiModelProperty(value = "开户名称")
-    public String accountName;
-
-    @SerializedName("account_bank")
-    @ApiModelProperty(value = "开户银行")
-    public String accountBank;
-
-    @SerializedName("bank_branch_id")
-    @ApiModelProperty(value = "开户银行银行号")
-    public String bankBranchId;
-
-    @SerializedName("account_number")
-    @ApiModelProperty(value = "银行账号")
-    public String accountNumber;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/BusinessInfo.java

@@ -1,23 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "经营资料")
-public class BusinessInfo {
-
-    @SerializedName("merchant_shortname")
-    @ApiModelProperty(value = "商户简称")
-    public String merchantShortname;
-
-    @SerializedName("service_phone")
-    @ApiModelProperty(value = "客服电话")
-    public String servicePhone;
-
-    @SerializedName("sales_info")
-    @ApiModelProperty(value = "经营场景")
-    public SalesInfo salesInfo;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/BusinessLicense.java

@@ -1,39 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-@ApiModel(value = "营业执照")
-public class BusinessLicense {
-    @SerializedName("license_copy")
-    @ApiModelProperty(value = "营业执照照片")
-    public String licenseCopy;
-
-    @SerializedName("license_number")
-    @ApiModelProperty(value = "注册号/统一社会信用代码")
-    public String licenseNumber;
-
-    @SerializedName("merchant_name")
-    @ApiModelProperty(value = "商户名称")
-    public String merchantName;
-
-    @SerializedName("legal_person")
-    @ApiModelProperty(value = "个体户经营者/法定代表人姓名")
-    public String legalPerson;
-
-    @SerializedName("license_address")
-    @ApiModelProperty(value = "注册地址")
-    public String licenseAddress;
-
-    @SerializedName("period_begin")
-    @ApiModelProperty(value = "有效期限开始日期")
-    public String periodBegin;
-
-    @SerializedName("period_end")
-    @ApiModelProperty(value = "有效期限结束日期")
-    public String periodEnd;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/ContactInfo.java

@@ -1,31 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author kaur
- */
-@Data
-@ApiModel(value = "超级管理员信息")
-public class ContactInfo {
-
-    @SerializedName("contact_type")
-    @ApiModelProperty(value = "超级管理员类型 LEGAL-经营者/法定代表人")
-    private String contactType;
-
-    @SerializedName("contact_name")
-    @ApiModelProperty(value = "超级管理员姓名-需加密")
-    private String contactName;
-
-    @SerializedName("mobile_phone")
-    @ApiModelProperty(value = "联系手机-需加密")
-    private String mobilePhone;
-
-    @SerializedName("contact_email")
-    @ApiModelProperty(value = "联系邮箱-需加密")
-    private String contactEmail;
-
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/IdCardInfo.java

@@ -1,38 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "身份证信息")
-public class IdCardInfo {
-    @SerializedName("id_card_copy")
-    @ApiModelProperty(value = "身份证人像面照片")
-    public String idCardCopy;
-
-    @SerializedName("id_card_national")
-    @ApiModelProperty(value = "身份证国徽面照片")
-    public String idCardNational;
-
-    @SerializedName("id_card_name")
-    @ApiModelProperty(value = "身份证姓名")
-    public String idCardName;
-
-    @SerializedName("id_card_number")
-    @ApiModelProperty(value = "身份证号码")
-    public String idCardNumber;
-
-    @SerializedName("id_card_address")
-    @ApiModelProperty(value = "身份证居住地址-主体类型为企业时，需要填写。其他主体类型，无需上传")
-    public String idCardAddress;
-
-    @SerializedName("card_period_begin")
-    @ApiModelProperty(value = "身份证有效期开始时间")
-    public String cardPeriodBegin;
-
-    @SerializedName("card_period_end")
-    @ApiModelProperty(value = "身份证有效期结束时间")
-    public String cardPeriodEnd;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/IdentityInfo.java

@@ -1,19 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "经营者/法定代表人身份证件")
-public class IdentityInfo {
-
-    @SerializedName("id_doc_type")
-    @ApiModelProperty(value = "IDENTIFICATION_TYPE_IDCARD-中国大陆居民-身份证")
-    public String idDocType;
-
-    @SerializedName("id_card_info")
-    @ApiModelProperty(value = "身份证信息")
-    public IdCardInfo idCardInfo;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/MiniProgramInfo.java

@@ -1,24 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "小程序场景")
-public class MiniProgramInfo {
-    @SerializedName("mini_program_appid")
-    @ApiModelProperty(value = "服务商小程序AppID")
-    public String miniProgramAppid;
-
-    @SerializedName("mini_program_sub_appid")
-    @ApiModelProperty(value = "商家小程序AppID")
-    public String miniProgramSubAppid;
-
-    @SerializedName("mini_program_pics")
-    @ApiModelProperty(value = "小程序截图")
-    public List<String> miniProgramPics;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/SalesInfo.java

@@ -1,25 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.common.collect.Lists;
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "经营场景")
-public class SalesInfo {
-    @SerializedName("sales_scenes_type")
-    @ApiModelProperty(value = "经营场景类型")
-    public List<String> salesScenesType = Lists.newArrayList("SALES_SCENES_STORE","SALES_SCENES_MINI_PROGRAM");
-
-    @SerializedName("biz_store_info")
-    @ApiModelProperty(value = "线下场所场景")
-    public StoreInfo bizStoreInfo;
-
-    @SerializedName("mini_program_info")
-    @ApiModelProperty(value = "小程序场景")
-    public MiniProgramInfo miniProgramInfo;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/SettlementInfo.java

@@ -1,20 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "结算规则")
-public class SettlementInfo {
-
-    @SerializedName("settlement_id")
-    @ApiModelProperty(value = "入驻结算规则ID")
-    public String settlementId;
-
-    @SerializedName("qualification_type")
-    @ApiModelProperty(value = "所属行业-填写指定行业名称")
-    public String qualificationType;
-
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/StoreInfo.java

@@ -1,37 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "线下场所场景")
-public class StoreInfo {
-
-    @SerializedName("biz_store_name")
-    @ApiModelProperty(value = "线下场所名称")
-    public String bizStoreName;
-
-    @SerializedName("biz_address_code")
-    @ApiModelProperty(value = "线下场所省市编码")
-    public String bizAddressCode;
-
-    @SerializedName("biz_store_address")
-    @ApiModelProperty(value = "线下场所地址")
-    public String bizStoreAddress;
-
-    @SerializedName("store_entrance_pic")
-    @ApiModelProperty(value = "线下场所门头照片")
-    public List<String> storeEntrancePic;
-
-    @SerializedName("indoor_pic")
-    @ApiModelProperty(value = "线下场所内部照片")
-    public List<String> indoorPic;
-
-    @SerializedName("biz_sub_appid")
-    @ApiModelProperty(value = "线下场所对应的商家AppID")
-    public String bizSubAppid;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/SubjectInfo.java

@@ -1,34 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "主体资料")
-public class SubjectInfo {
-
-    @SerializedName("subject_type")
-    @ApiModelProperty(value = "主体类型 SUBJECT_TYPE_INDIVIDUAL-个体户 SUBJECT_TYPE_ENTERPRISE-企业")
-    public String subjectType;
-
-    @SerializedName("finance_institution")
-    @ApiModelProperty(value = "是否金融机构")
-    public Boolean financeInstitution;
-
-    @SerializedName("business_license_info")
-    @ApiModelProperty(value = "营业执照")
-    public BusinessLicense businessLicenseInfo;
-
-    @SerializedName("identity_info")
-    @ApiModelProperty(value = "经营者/法定代表人身份证件")
-    public IdentityInfo identityInfo;
-
-    @SerializedName("ubo_info_list")
-    @ApiModelProperty(value = "最终受益人信息列表(UBO) 主体类型为企业时，需填写")
-    public List<UBOInfoList> uboInfoList;
-
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/SubmitInfo.java

@@ -1,39 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author kaur
- */
-@Data
-@ApiModel(value = "超级管理员信息")
-public class SubmitInfo {
-
-    @SerializedName("business_code")
-    @ApiModelProperty(value = "业务申请编号")
-    public String businessCode;
-
-    @SerializedName("contact_info")
-    @ApiModelProperty(value = "超级管理员信息")
-    public ContactInfo contactInfo;
-
-    @SerializedName("subject_info")
-    @ApiModelProperty(value = "主体资料")
-    public SubjectInfo subjectInfo;
-
-    @SerializedName("business_info")
-    @ApiModelProperty(value = "经营资料")
-    public BusinessInfo businessInfo;
-
-    @SerializedName("settlement_info")
-    @ApiModelProperty(value = "结算规则")
-    public SettlementInfo settlementInfo;
-
-    @SerializedName("bank_account_info")
-    @ApiModelProperty(value = "结算银行账户")
-    public BankAccountInfo bankAccountInfo;
-
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/SubmitInfoForm.java

@@ -1,109 +0,0 @@
-package com.yami.shop.wx.form;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author kaur
- */
-@Data
-@ApiModel(value = "提交")
-public class SubmitInfoForm {
-
-    @ApiModelProperty(value = "超级管理员姓名-需加密")
-    private String contactName;
-
-    @ApiModelProperty(value = "联系手机-需加密")
-    private String mobilePhone;
-
-    @ApiModelProperty(value = "联系邮箱-需加密")
-    private String contactEmail;
-
-    @ApiModelProperty(value = "主体类型 SUBJECT_TYPE_INDIVIDUAL-个体户 SUBJECT_TYPE_ENTERPRISE-企业")
-    public String subjectType;
-
-    @ApiModelProperty(value = "营业执照照片")
-    public String licenseCopy;
-
-    @ApiModelProperty(value = "注册号/统一社会信用代码")
-    public String licenseNumber;
-
-    @ApiModelProperty(value = "商户名称")
-    public String merchantName;
-
-    @ApiModelProperty(value = "个体户经营者/法定代表人姓名")
-    public String legalPerson;
-
-    @ApiModelProperty(value = "注册地址")
-    public String licenseAddress;
-
-    @ApiModelProperty(value = "有效期限开始日期")
-    public String periodBegin;
-
-    @ApiModelProperty(value = "有效期限结束日期")
-    public String periodEnd;
-
-    @ApiModelProperty(value = "身份证人像面照片")
-    public String idCardCopy;
-
-    @ApiModelProperty(value = "身份证国徽面照片")
-    public String idCardNational;
-
-    @ApiModelProperty(value = "身份证姓名")
-    public String idCardName;
-
-    @ApiModelProperty(value = "身份证号码")
-    public String idCardNumber;
-
-    @ApiModelProperty(value = "身份证居住地址-主体类型为企业时，需要填写。其他主体类型，无需上传")
-    public String idCardAddress;
-
-    @ApiModelProperty(value = "身份证有效期开始时间")
-    public String cardPeriodBegin;
-
-    @ApiModelProperty(value = "身份证有效期结束时间")
-    public String cardPeriodEnd;
-
-    @ApiModelProperty(value = "商户简称")
-    public String merchantShortname;
-
-    @ApiModelProperty(value = "客服电话")
-    public String servicePhone;
-
-    @ApiModelProperty(value = "线下场所名称")
-    public String bizStoreName;
-
-    @ApiModelProperty(value = "线下场所省市编码")
-    public String bizAddressCode;
-
-    @ApiModelProperty(value = "线下场所地址")
-    public String bizStoreAddress;
-
-    @ApiModelProperty(value = "线下场所门头照片")
-    public List<String> storeEntrancePic;
-
-    @ApiModelProperty(value = "线下场所内部照片")
-    public List<String> indoorPic;
-
-    @ApiModelProperty(value = "所属行业-填写指定行业名称")
-    public String qualificationType;
-
-    @ApiModelProperty(value = "账户类型 BANK_ACCOUNT_TYPE_CORPORATE-对公银行账户 BANK_ACCOUNT_TYPE_PERSONAL- 经营者个人银行卡")
-    public String bankAccountType;
-
-    @ApiModelProperty(value = "开户名称")
-    public String accountName;
-
-    @ApiModelProperty(value = "开户银行")
-    public String accountBank;
-
-    @ApiModelProperty(value = "开户银行银行号")
-    public String bankBranchId;
-
-    @ApiModelProperty(value = "银行账号")
-    public String accountNumber;
-
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/form/UBOInfoList.java

@@ -1,42 +0,0 @@
-package com.yami.shop.wx.form;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "最终受益人信息列表(UBO) 主体类型为企业时，需填写")
-public class UBOInfoList {
-    @SerializedName("ubo_id_doc_type")
-    @ApiModelProperty(value = "IDENTIFICATION_TYPE_IDCARD- 中国大陆居民-身份证")
-    public String uboIdDocType;
-
-    @SerializedName("ubo_id_doc_copy")
-    @ApiModelProperty(value = "证件正面照片")
-    public String uboIdDocCopy;
-
-    @SerializedName("ubo_id_doc_copy_back")
-    @ApiModelProperty(value = "证件反面照片")
-    public String uboIdDocCopyBack;
-
-    @SerializedName("ubo_id_doc_name")
-    @ApiModelProperty(value = "证件姓名")
-    public String uboIdDocName;
-
-    @SerializedName("ubo_id_doc_number")
-    @ApiModelProperty(value = "证件号码")
-    public String uboIdDocNumber;
-
-    @SerializedName("ubo_id_doc_address")
-    @ApiModelProperty(value = "证件居住地址")
-    public String uboIdDocAddress;
-
-    @SerializedName("ubo_period_begin")
-    @ApiModelProperty(value = "证件有效期开始时间")
-    public String uboPeriodBegin;
-
-    @SerializedName("ubo_period_end")
-    @ApiModelProperty(value = "证件有效期结束时间")
-    public String uboPeriodEnd;
-}

yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -1,10 +1,8 @@
 package com.yami.shop.wx.service.impl;
-import com.yami.shop.wx.po.*;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
-import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
@@ -17,7 +15,9 @@ import com.yami.shop.bean.bo.PayInfoBo;
 import com.yami.shop.wx.config.CombinePayUrlEnum;
 import com.yami.shop.wx.config.WechatPayServiceConfig;
 import com.yami.shop.wx.config.WxConstants;
-import com.yami.shop.wx.form.*;
+import com.yami.shop.wx.po.JsapiPayInfoPo;
+import com.yami.shop.wx.po.RefundInfoPo;
+import com.yami.shop.wx.po.TraceWaybill;
 import com.yami.shop.wx.service.WxProviderService;
 import com.yami.shop.wx.utils.*;
 import lombok.SneakyThrows;
@@ -43,7 +43,10 @@ import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
 @Slf4j
@@ -436,14 +439,14 @@ public class WxProviderServiceImpl implements WxProviderService {
      * @param trackingNo     物流单号
      * @param transactionId  原支付交易对应的微信订单号
      * @param expressCompany 物流公司编码 例如：SF
-     * @param itemDesc      例如：微信红包抱枕*1个，限120个字以内
+     * @param itemDesc       例如：微信红包抱枕*1个，限120个字以内
      * @param phone          当发货的物流公司为顺丰时，联系方式为必填，收件人或寄件人联系方式二选一
      * @param openid         微信open_id-小程序
      * @param type           物流模式，发货方式枚举值：1、实体物流配送采用快递公司进行实体物流配送形式
      *                       2、同城配送 3、虚拟商品，虚拟商品，例如话费充值，点卡等，无实体配送形式 4、用户自提
      */
     public static void uploadShippingInfo(String trackingNo, String transactionId, String itemDesc,
-                                           String phone, String openid, String expressCompany, Integer type) {
+                                          String phone, String openid, String expressCompany, Integer type) {
         AccessToken accessToken = AccessTokenApi.getAccessToken(WxConstants.APPLET_APPID, WxConstants.APPLET_SECRET);
         String url = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token=" + accessToken.getToken();
         // 定义日期时间格式化对象
@@ -498,6 +501,7 @@ public class WxProviderServiceImpl implements WxProviderService {
             CloseableHttpResponse response = httpClient.execute(httpPost);
             HttpEntity responseEntity = response.getEntity();
             String responseString = EntityUtils.toString(responseEntity);
+            System.out.println(" ==========返回结果========= " + responseString);
             log.info(responseString);
             response.close();
             httpClient.close();
@@ -514,11 +518,11 @@ public class WxProviderServiceImpl implements WxProviderService {
             CloseableHttpClient httpClient = HttpClients.createDefault();
             HttpPost httpPost = new HttpPost(url);
             httpPost.addHeader("Content-Type", "application/json");
-            StringEntity requestBody = new StringEntity(new Gson().toJson(traceWaybill),  ContentType.APPLICATION_JSON.withCharset("UTF-8"));
+            StringEntity requestBody = new StringEntity(new Gson().toJson(traceWaybill), ContentType.APPLICATION_JSON.withCharset("UTF-8"));
             httpPost.setEntity(requestBody);
             CloseableHttpResponse response = httpClient.execute(httpPost);
             HttpEntity responseEntity = response.getEntity();
-            String responseString = EntityUtils.toString(responseEntity,"UTF-8");
+            String responseString = EntityUtils.toString(responseEntity, "UTF-8");
             log.info(responseString);
             response.close();
             httpClient.close();
@@ -529,142 +533,6 @@ public class WxProviderServiceImpl implements WxProviderService {
         return "";
     }
 
-
-
-    //测试
-    public static void serviceAddMerchant(SubmitInfoForm form) {
-        SubmitInfo submitInfo = new SubmitInfo();
-        submitInfo.setBusinessCode("业务申请编号");
-
-        //超级管理员信息
-        ContactInfo contactInfo = new ContactInfo();
-        contactInfo.setContactType("LEGAL");
-        contactInfo.setContactName(rsaEncryptData(form.getContactName()));
-        contactInfo.setMobilePhone(rsaEncryptData(form.getMobilePhone()));
-        contactInfo.setContactEmail(rsaEncryptData(form.getContactEmail()));
-        submitInfo.setContactInfo(contactInfo);
-
-        //主体资料
-        SubjectInfo subjectInfo = new SubjectInfo();
-        subjectInfo.setSubjectType(form.getSubjectType());
-        subjectInfo.setFinanceInstitution(false);
-
-        //营业执照
-        BusinessLicense businessLicense = new BusinessLicense();
-        businessLicense.setLicenseCopy(wxUploadImg(form.getLicenseCopy()));
-        businessLicense.setLicenseNumber(form.getLicenseNumber());
-        businessLicense.setMerchantName(form.getMerchantName());
-        businessLicense.setLegalPerson(form.getLegalPerson());
-        businessLicense.setLicenseAddress(form.getLicenseAddress());
-        businessLicense.setPeriodBegin(form.getPeriodBegin());
-        businessLicense.setPeriodEnd(form.getPeriodEnd());
-        subjectInfo.setBusinessLicenseInfo(businessLicense);
-
-        //经营者/法定代表人身份证件
-        IdentityInfo identityInfo = new IdentityInfo();
-        identityInfo.setIdDocType("IDENTIFICATION_TYPE_IDCARD");
-
-        //身份证信息
-        IdCardInfo idCardInfo = new IdCardInfo();
-        idCardInfo.setIdCardCopy(wxUploadImg(form.getIdCardCopy()));
-        idCardInfo.setIdCardNational(wxUploadImg(form.getIdCardNational()));
-        idCardInfo.setIdCardName(rsaEncryptData(form.getIdCardName()));
-        idCardInfo.setIdCardNumber(rsaEncryptData(form.getIdCardNumber()));
-        idCardInfo.setIdCardAddress(rsaEncryptData(form.getIdCardAddress()));
-        idCardInfo.setCardPeriodBegin(form.getCardPeriodBegin());
-        idCardInfo.setCardPeriodEnd(form.getCardPeriodEnd());
-        identityInfo.setIdCardInfo(idCardInfo);
-        subjectInfo.setIdentityInfo(identityInfo);
-        List<UBOInfoList> uboInfoList = Lists.newArrayList();
-
-        //最终受益人信息列表(UBO) 主体类型为企业时，需填写
-        UBOInfoList uboInfo = new UBOInfoList();
-        uboInfo.setUboIdDocType("IDENTIFICATION_TYPE_IDCARD");
-        uboInfo.setUboIdDocCopy(wxUploadImg(form.getIdCardCopy()));
-        uboInfo.setUboIdDocCopyBack(wxUploadImg(form.getIdCardNational()));
-        uboInfo.setUboIdDocName(rsaEncryptData(form.getIdCardName()));
-        uboInfo.setUboIdDocNumber(rsaEncryptData(form.getIdCardNumber()));
-        uboInfo.setUboIdDocAddress(rsaEncryptData(form.getIdCardAddress()));
-        uboInfo.setUboPeriodBegin(form.getCardPeriodBegin());
-        uboInfo.setUboPeriodEnd(form.getCardPeriodEnd());
-        uboInfoList.add(uboInfo);
-        subjectInfo.setUboInfoList(uboInfoList);
-        submitInfo.setSubjectInfo(subjectInfo);
-
-        //经营资料
-        BusinessInfo businessInfo = new BusinessInfo();
-        businessInfo.setMerchantShortname(form.getMerchantShortname());
-        businessInfo.setServicePhone(form.getServicePhone());
-
-        //经营场景
-        SalesInfo salesInfo = new SalesInfo();
-        salesInfo.setSalesScenesType(Lists.newArrayList("SALES_SCENES_STORE","SALES_SCENES_MINI_PROGRAM"));
-
-        //线下场所场景
-        StoreInfo storeInfo = new StoreInfo();
-        storeInfo.setBizStoreName(form.getBizStoreName());
-        storeInfo.setBizAddressCode(form.getBizAddressCode());
-        storeInfo.setBizStoreAddress(form.getBizStoreAddress());
-
-        storeInfo.setStoreEntrancePic(wxUploadImgList(Lists.newArrayList(form.getStoreEntrancePic())));
-        storeInfo.setIndoorPic(wxUploadImgList(Lists.newArrayList(form.getIndoorPic())));
-
-        storeInfo.setBizSubAppid("wx472b8557b46b80c2");
-        salesInfo.setBizStoreInfo(storeInfo);
-
-        //小程序场景
-        MiniProgramInfo miniProgramInfo = new MiniProgramInfo();
-        miniProgramInfo.setMiniProgramAppid("wx84ac4c97670ae96f");
-        miniProgramInfo.setMiniProgramSubAppid("wx472b8557b46b80c2");
-        miniProgramInfo.setMiniProgramPics(wxUploadImgList(Lists.newArrayList("小程序截图")));
-        salesInfo.setMiniProgramInfo(miniProgramInfo);
-        businessInfo.setSalesInfo(salesInfo);
-        submitInfo.setBusinessInfo(businessInfo);
-
-        //结算规则
-        SettlementInfo settlementInfo = new SettlementInfo();
-        settlementInfo.setSettlementId(form.getSubjectType().equals("SUBJECT_TYPE_INDIVIDUAL") ? "719" : "716");
-        settlementInfo.setQualificationType(form.getQualificationType());
-        submitInfo.setSettlementInfo(settlementInfo);
-
-        //结算银行账户
-        BankAccountInfo bankAccountInfo = new BankAccountInfo();
-        bankAccountInfo.setBankAccountType(form.getBankAccountType());
-        bankAccountInfo.setAccountName(rsaEncryptData(form.getAccountName()));
-
-        //开户银行-对私银行列表-对公银行列表-查看是否需要填写支行字段-bank_alias_code
-        bankAccountInfo.setAccountBank(form.getAccountBank());
-        //查询接口
-        if (form.getBankBranchId()!=null){
-            bankAccountInfo.setBankBranchId(form.getBankBranchId());
-        }
-        bankAccountInfo.setAccountNumber(rsaEncryptData(form.getAccountNumber()));
-        submitInfo.setBankAccountInfo(bankAccountInfo);
-        String json = new Gson().toJson(submitInfo);
-        System.out.println(json);
-    }
-
-    private static String rsaEncryptData(String data) {
-        return data;
-    }
-
-    private static String wxUploadImg(String data) {
-        return data;
-    }
-
-    private static List<String> wxUploadImgList(List<String> imgList) {
-        List<String> wxImgList = Lists.newArrayList();
-        for (String img : imgList) {
-            wxImgList.add(wxUploadImg(img));
-        }
-        return wxImgList;
-    }
-
-    private static String toDataImgList(List<String> imgList) {
-        return String.join(",", imgList);
-    }
-
-
     public static void main(String[] args) {
 
     }