卡密商品提货无需收货地址

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -335,8 +335,21 @@ public class UserDeliverOrderController extends BaseApiController {
         if (null == orderSettleVO) {
             return AjaxResult.error("订单已过期，请重新下单");
         }
-        if (null == orderSettleVO.getAddr()) {
+        if (order.getGoodsType() == 1 && null == orderSettleVO.getAddr()) {
             return AjaxResult.error("请填写收货地址");
+        }else if (order.getGoodsType() == 2){
+            //读取默认地址
+            UserAddr addr = userAddrService.getDefaultChannelAddr(userId);
+            if (null != addr) {
+                orderSettleVO.setAddr(addr);
+            }else {
+                addr = new UserAddr();
+                addr.setUserId(userId);
+                addr.setStatus(0);
+                addr.setCommonAddr(1);
+                orderSettleVO.setAddr(addr);
+            }
+
         }
         String orderId = userDeliverOrderService.submitOrder(userId, order.getMemo(), orderSettleVO);
         JSONObject jsonObject = new JSONObject();

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrder.java

@@ -165,5 +165,6 @@ public class UserDeliverOrder implements Serializable {
   @Version
   private Date updatedTime;
 
-
+  @ApiModelProperty("商品类型:1实物,2卡密")
+  private Integer goodsType;
 }