add deliver

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -278,7 +278,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         if (Objects.equals(refundType, RefundType.ALL.value())) {
             order.setRefundStatus(RefundStatusEnum.APPLY.value());
         } else {
-            order.setRefundStatus(RefundStatusEnum.PARTIAL_SUCCESS.value());
+            order.setRefundStatus(RefundStatusEnum.APPLY.value());
         }
         orderService.updateById(order);
         return orderRefund;

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

@@ -0,0 +1,48 @@
+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 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;
+
+}

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

@@ -529,50 +529,41 @@ public class WxProviderServiceImpl implements WxProviderService {
     }
 
 
-    private static void trace_waybill() {
-        TraceWaybill traceWaybill = new TraceWaybill();
-        traceWaybill.setOpenid("openid");
-        traceWaybill.setReceiverPhone("接收人电话");
-        traceWaybill.setDeliveryId("SF");
-        traceWaybill.setWaybillId("SF123456");
-        List<TraceWaybillGoodsInfo> goodsInfoList = Lists.newArrayList();
-        goodsInfoList.add(new TraceWaybillGoodsInfo("可口可乐","地址"));
-        traceWaybill.setGoodsInfo(new TraceWaybillDetail(goodsInfoList));
-        traceWaybill.setTransId("交易id");
-        System.out.println(new Gson().toJson(traceWaybill));
-    }
-
-
 
     //测试
-    public static void serviceAddMerchant() {
+    public static void serviceAddMerchant(SubmitInfoForm form) {
         SubmitInfo submitInfo = new SubmitInfo();
         submitInfo.setBusinessCode("业务申请编号");
 
         //超级管理员信息
         ContactInfo contactInfo = new ContactInfo();
         contactInfo.setContactType("LEGAL");
-        contactInfo.setContactName(rsaEncryptData("超级管理员姓名"));
-        contactInfo.setMobilePhone(rsaEncryptData("联系手机"));
-        contactInfo.setContactEmail(rsaEncryptData("联系邮箱"));
+        contactInfo.setContactName(rsaEncryptData(form.getContactName()));
+        contactInfo.setMobilePhone(rsaEncryptData(form.getMobilePhone()));
+        contactInfo.setContactEmail(rsaEncryptData(form.getContactEmail()));
         submitInfo.setContactInfo(contactInfo);
 
         //主体资料
         SubjectInfo subjectInfo = new SubjectInfo();
-        subjectInfo.setSubjectType("个体户/企业");
+        subjectInfo.setSubjectType(form.getSubjectType());
         subjectInfo.setFinanceInstitution(false);
-        BusinessLicense businessLicense = new BusinessLicense();
-        businessLicense.setLicenseCopy("营业执照照片");
-        businessLicense.setLicenseNumber("统一社会信用代码");
-        businessLicense.setMerchantName("商户名称");
-        businessLicense.setLegalPerson("个体户经营者/法定代表人姓名");
-        businessLicense.setLicenseAddress("注册地址");
-        businessLicense.setPeriodBegin("有效期限开始日期");
-        businessLicense.setPeriodEnd("有效期限结束日期");
 
+        //营业执照
+        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("身份证人像面照片");
         idCardInfo.setIdCardNational("身份证国徽面照片");
@@ -584,6 +575,8 @@ public class WxProviderServiceImpl implements WxProviderService {
         identityInfo.setIdCardInfo(idCardInfo);
         subjectInfo.setIdentityInfo(identityInfo);
         List<UBOInfoList> uboInfoList = Lists.newArrayList();
+
+        //最终受益人信息列表(UBO) 主体类型为企业时，需填写
         UBOInfoList uboInfo = new UBOInfoList();
         uboInfo.setUboIdDocType("IDENTIFICATION_TYPE_IDCARD");
         uboInfo.setUboIdDocCopy("证件正面照片");
@@ -641,7 +634,10 @@ public class WxProviderServiceImpl implements WxProviderService {
         return data;
     }
 
+    private static String wxUploadImg(String data) {
+        return data;
+    }
+
     public static void main(String[] args) {
-        trace_waybill();
     }
 }