Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of…

Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -137,6 +137,7 @@ public class SpellGroupOrderAdapter {
         calculationDiscountRequestDto.setStoreId(createSpellGroupOrderDto.getStoreId());
         calculationDiscountRequestDto.setPartnerCode(createSpellGroupOrderDto.getPartnerId());
         calculationDiscountRequestDto.setUserId(userLoginInfoDto.getMemberId());
+        calculationDiscountRequestDto.setApplication("isaas");
         List<CalculationDiscountGoodsDto> discountGoodsDtoList = new ArrayList<>();
         createSpellGroupOrderDto.getProducts().forEach(productInfo -> {
             CalculationDiscountGoodsDto discountGoodsDto = new CalculationDiscountGoodsDto();

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

@@ -375,7 +375,7 @@ public class OrderAdapterServiceImpl {
                         break;
                     }
                     // 默认点餐处理
-                    if (orderBean.getBizType() == BizTypeEnum.ORDINARY.getBizType()) {
+                    if (orderBean.getBizType() == BizTypeEnum.ORDINARY.getBizType() || orderBean.getBizType() == BizTypeEnum.ADVANCE_ORDER.getBizType() ) {
                         result = orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                         break;
                     }