前端bug修复

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OmsOrderModifyParam.java

@@ -49,4 +49,8 @@ public class OmsOrderModifyParam implements Serializable
      * 商品信息
      */
     private OmsGoodsModifyParam goodsInfo;
+    /**
+     * 订单备注
+     */
+    private String note;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -398,7 +398,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     public Pagination<MerchantDTO> getUserMineCartPaging(OmsCartItemPagingParam param) {
         Long userId = SessionContextHolder.getSession().getId();
         List<Long> merchants = this.baseMapper.getMerchantIds(userId);
-        if (merchants == null && merchants.size() < 1) {
+        if (merchants == null || merchants.size() < 1) {
             return null;
         }
         Page<Merchant> page = this.lambdaQuery()

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -189,6 +189,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 //        lockStock(cartPromotionItemList);
         //根据商品合计、运费、活动优惠、优惠券、积分计算应付金额
         OmsOrder order = new OmsOrder();
+        order.setNote(orderParam.getNote());
         order.setDiscountAmount(new BigDecimal(0));
         order.setTotalAmount(calcTotalAmount(orderItemList));
         order.setFreightAmount(new BigDecimal(0));