Merge branch 'dev' into 'mp-server-test'

提货订单类型

See merge request quanshu/mp-server!926

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

@@ -112,7 +112,7 @@ public class UserDeliverOrder implements Serializable {
   @TableField("memo")
   private String memo;
 
-  @ApiModelProperty("订单类型")
+  @ApiModelProperty("订单类型:1普通订单,2卡密订单")
   @TableField("type")
   private Integer type;
 

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -95,6 +95,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
         userDeliverOrder.setCity(userAddr.getCity());
         userDeliverOrder.setArea(userAddr.getArea());
         userDeliverOrder.setAddress(userAddr.getAddr());
+        userDeliverOrder.setType(orderSettleVO.getOrderType());
         userDeliverOrder.setOrderNum(
             orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
         userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());