chunping 3 rokov pred
rodič
commit
379639d48c

+ 4 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -149,6 +149,7 @@ public class ChannelOrderController extends BaseApiController {
 
     // 订单金额计算
     Integer orderAmt = 0;
+    Integer pkgNum = 0;
     if (!CollectionUtils.isEmpty(param.getCartIds())){
       // 购物车里下单的
       List<ChannelCart> channelCarts = channelCartService.listByIds(param.getCartIds());
@@ -159,6 +160,7 @@ public class ChannelOrderController extends BaseApiController {
         cartVO.setCartId(channelCart.getCartId());
         cartVO.setOrderNum(channelCart.getOrderNum());
         orderSettleVO.getItems().add(cartVO);
+        pkgNum += channelCart.getOrderNum();
       }
     } else {
       TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
@@ -166,10 +168,12 @@ public class ChannelOrderController extends BaseApiController {
       ChannelCartVO cartVO = mapperFacade.map(ticketBox, ChannelCartVO.class);
       cartVO.setOrderNum(param.getOrderNum());
       orderSettleVO.getItems().add(cartVO);
+      pkgNum += param.getOrderNum();
     }
     orderSettleVO.setOrderAmt(orderAmt);
     // 当前没有运费和优惠,实付金额=订单金额
     orderSettleVO.setPayAmt(orderAmt);
+    orderSettleVO.setPkgNum(pkgNum);
 
     // 缓存订单结算对象
     redisCache.setCacheObject(CHANNEL_ORDER_CACHE_KEY + channelId, orderSettleVO, 10, TimeUnit.MINUTES);

+ 3 - 3
mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrder.java

@@ -72,10 +72,10 @@ public class ChannelOrder implements Serializable {
   private ChannelOrderStatusEnum status;
 
   /**
-   * 商品总
+   * 盲票总包
    */
-  @TableField("prod_num")
-  private Integer prodNum;
+  @TableField("pkg_num")
+  private Integer pkgNum;
 
   /**
    * 备注

+ 5 - 0
mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderSettleVO.java

@@ -39,4 +39,9 @@ public class ChannelOrderSettleVO {
    * 订单明细
    */
   private List<ChannelCartVO> items = new ArrayList<>();
+
+  /**
+   * 盲票包数
+   */
+  private Integer pkgNum = 0;
 }

+ 1 - 1
mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -107,7 +107,7 @@ public class ChannelOrderServiceImpl extends ServiceImpl<ChannelOrderMapper, Cha
     channelOrder.setFreightAmt(orderSettleVO.getFreightAmt());
     channelOrder.setPayAmt(orderSettleVO.getPayAmt());
     channelOrder.setStatus(ChannelOrderStatusEnum.NOT_PAY);
-    channelOrder.setProdNum(prodNum);
+    channelOrder.setPkgNum(orderSettleVO.getPkgNum());
     channelOrder.setMemo(memo);
     channelOrder.setReceiver(addr.getReceiver());
     channelOrder.setTel(addr.getMobile());

+ 2 - 2
mp-service/src/main/resources/mapper/channel/ChannelOrderMapper.xml

@@ -12,7 +12,7 @@
         <result column="freight_amt" property="freightAmt" />
         <result column="pay_amt" property="payAmt" />
         <result column="status" property="status" />
-        <result column="prod_num" property="prodNum" />
+        <result column="pkg_num" property="pkgNum" />
         <result column="memo" property="memo" />
         <result column="receiver" property="receiver" />
         <result column="tel" property="tel" />
@@ -28,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        order_id, channel_id, title, order_amt, discount_amt, freight_amt, pay_amt, status, prod_num, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, created_time, updated_time
+        order_id, channel_id, title, order_amt, discount_amt, freight_amt, pay_amt, status, pkg_num, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, created_time, updated_time
     </sql>
 
 </mapper>