add deliver

yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java

@@ -37,4 +37,8 @@ public class DeliveryOrderParam {
     @ApiModelProperty(value = "物流公司编号",required=true)
     private String dvyNo;
 
+    @NotBlank(message="配送类型 1:快递 2:自提 3：及时配送")
+    @ApiModelProperty(value = "配送类型 1:快递 2:自提 3：及时配送",required=true)
+    private Integer dvyType;
+
 }

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

@@ -155,6 +155,13 @@ public class OrderController {
         }
 
         Order orderParam = new Order();
+        if (deliveryOrderParam.getDvyType().equals(2)){
+            orderParam.setOrderId(order.getOrderId());
+            orderParam.setDvyType(2);
+            orderService.updateById(orderParam);
+            return ResponseEntity.ok().build();
+        }
+
         orderParam.setOrderId(order.getOrderId());
         if (!Objects.equals(order.getDvyType(), DvyType.FETCH.value()) || !Objects.equals(order.getDvyType(), DvyType.NOT_DELIVERY.value())){
             orderParam.setDvyId(deliveryOrderParam.getDvyId());

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

@@ -14,7 +14,13 @@ public class ContactInfoDto {
     @ApiModelProperty(value = "超级管理员类型 1.LEGAL-经营者/法定代表人  2.SUPER-经办人")
     private String contactType;
 
-    @ApiModelProperty(value = "超级管理员证件类型 1.IDENTIFICATION_TYPE_IDCARD-中国大陆居民-身份证")
-    private String contactIdDocType;
+    @ApiModelProperty(value = "超级管理员姓名-需加密")
+    private String contactName;
+
+    @ApiModelProperty(value = "联系手机-需加密")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "联系邮箱-需加密")
+    private String contactEmail;
 
 }

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

@@ -0,0 +1,21 @@
+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 SubjectInfoDto {
+
+    @ApiModelProperty(value = "主体类型 1.SUBJECT_TYPE_INDIVIDUAL-（个体户） " +
+            "2.SUBJECT_TYPE_ENTERPRISE-（企业）" +
+            "3.SUBJECT_TYPE_GOVERNMENT-（政府机关）" +
+            "4.SUBJECT_TYPE_INSTITUTIONS-（事业单位）" +
+            "5.SUBJECT_TYPE_OTHERS-（社会组织）")
+    private String subjectType;
+
+}