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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1175,7 +1175,7 @@ public class OrderSdkAdapter {
             data.setOrderPayItem(this.getOrderItemPayList(orderInfoReqs.getOrderPayItemCreateReqList()));
         }
         data.setPayChannelType(orderInfoReqs.getPayChannelType());
-//        data.setOrderPayItemCreateReqList(orderInfoReqs.getOrderPayItemCreateReqList());
+        //data.setOrderPayItemCreateReqList(orderInfoReqs.getOrderPayItemCreateReqList());
         return data;
     }
 

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

@@ -1136,8 +1136,10 @@ 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())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
                         BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
+            }
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -764,7 +764,7 @@ public class CheckOrder {
         }
         Integer svcAmount = 0 ;
         Integer svcVAmount = 0 ;
-        Long totalVAmount = shoppingCartGoodsDto.getTotalAmount();
+        Long totalVAmount = shoppingCartGoodsDto.getTotalAmount() +shoppingCartGoodsDto.getPackageAmount();
         if (svcCardAmount.getData().getData().getCardSimpleInfos().size()>0) {
             svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount();
             svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount();