Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -947,6 +947,11 @@ public class OrderAdapter {
             if (QueryOrderStatus.ORDER_CANCEL.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
                 queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
             }
+            if (QueryOrderStatus.ORDER_CANCEL_MIXUE.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
+                queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
+                queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
+            }
+
         }
 
         // 兼容历史版本，如果传参是4 查询拆程4和5
@@ -1133,7 +1138,7 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
-            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId()) && StringUtils.isNotBlank(responseVo.getPayVoucher())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
                         BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
             }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -31,7 +31,7 @@ public class QueryOrderVo {
     @ApiModelProperty(value = "订单编号")
     private String oid;
     /**
-     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消
      */
     private Integer queryOrderStatus;
     /**

order-application-service/src/main/java/cn/freemud/enums/QueryOrderStatus.java

@@ -20,7 +20,10 @@ public enum QueryOrderStatus {
     ALL_BILL(3, "全部"),
     REFUND_BILL(4, "退款"),
     NO_PAY(5, "待支付"),
-    ORDER_CANCEL(6, "已取消");
+    ORDER_CANCEL(6, "已取消"),
+    //密雪
+    ORDER_CANCEL_MIXUE(7, "未支付已取消");
+
 
     private Integer code;
 

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -289,7 +289,7 @@ public class ShoppingCartConvertAdapter {
                     ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
                     goods.setSpuId(materialGoods.getSpuId());
                     goods.setSpuName(materialGoods.getSpuName());
-                    goods.setOriginalPrice(materialGoods.getOriginalPrice());
+                    goods.setOriginalPrice(null != materialGoods.getOriginalPrice() ? materialGoods.getOriginalPrice() : 0);
                     goods.setSalePrice(materialGoods.getFinalPrice());
                     goods.setQty(cartGoods.getQty());
                     goods.setTotalDiscountAmount(0);