add deliver

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -272,6 +272,7 @@ public class OrderRefundController {
         List<OrderRefundSku> orderRefundSkuList = orderRefundParam.getOrderRefundSkuList();
         CullenUtils.validateDataThrowException(orderRefundSkuList.isEmpty(), "退款商品不能为空...");
         String userId = SecurityUtils.getUser().getUserId();
+//        String userId = "36726893042d492aba446439c5f00584";
         // 获取订单信息
         Order order = orderService.getOrderByOrderNumberAndUserId(orderRefundParam.getOrderNumber(), userId, true);
 

yami-shop-wx/src/main/java/com/yami/shop/wx/po/ContactInfoDto.java

@@ -0,0 +1,20 @@
+package com.yami.shop.wx.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author kaur
+ */
+@Data
+@ApiModel(value = "超级管理员信息")
+public class ContactInfoDto {
+
+    @ApiModelProperty(value = "超级管理员类型 1.LEGAL-经营者/法定代表人  2.SUPER-经办人")
+    private String contactType;
+
+    @ApiModelProperty(value = "超级管理员证件类型 1.IDENTIFICATION_TYPE_IDCARD-中国大陆居民-身份证")
+    private String contactIdDocType;
+
+}

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

@@ -42,10 +42,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
 @Slf4j
@@ -506,4 +503,29 @@ public class WxProviderServiceImpl implements WxProviderService {
             System.out.println(e.getMessage());
         }
     }
+
+    //测试
+    public static void serviceAddMerchant() {
+        Map<String, Object> parameters = new TreeMap<>();
+        //业务申请编号
+        parameters.put("business_code", "业务申请编号");
+
+        //超级管理员信息
+        parameters.put("contact_info", "");
+
+        //主体资料
+        parameters.put("subject_info", "");
+
+        //经营资料
+        parameters.put("business_info", "");
+
+        //结算规则
+        parameters.put("settlement_info", "");
+
+        //结算银行账户
+        parameters.put("bank_account_info", "");
+
+        System.out.println(parameters);
+    }
+
 }