| @@ -193,7 +193,7 @@ public class WxOrderController extends BaseController { | |||||
| // 免费券 | // 免费券 | ||||
| WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(EnumComposeOrder.SINGLE.getCode()).createDBMainOrder(coupon, user, 0, EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT); | WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(EnumComposeOrder.SINGLE.getCode()).createDBMainOrder(coupon, user, 0, EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT); | ||||
| order = wxOrderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,user, coupon, 1, | order = wxOrderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,user, coupon, 1, | ||||
| wxCouponChannel, orderSaveDto.getFormId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT, | |||||
| wxCouponChannel, orderSaveDto.getFormId(), null,null,EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT, | |||||
| EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | ||||
| return new ResultData(order); | return new ResultData(order); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| @@ -103,7 +103,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| try { | try { | ||||
| WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(EnumComposeOrder.SINGLE.getCode()).createDBMainOrder(coupon, member, 0, payWay); | WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(EnumComposeOrder.SINGLE.getCode()).createDBMainOrder(coupon, member, 0, payWay); | ||||
| WxOrder order = orderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,member, coupon, 1, | WxOrder order = orderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,member, coupon, 1, | ||||
| null, formId, couponPassword.getId(),payWay, | |||||
| null, formId, couponPassword.getId(),null,payWay, | |||||
| EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus)); | setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus)); | ||||
| @@ -49,14 +49,14 @@ public class SingleOrderAdapterService extends BaseBatchOrderAdapterService { | |||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | ||||
| EnumPayWay payWay) { | EnumPayWay payWay) { | ||||
| return super.createDBMainOrder(tenantEntity,user, payment, payWay, EnumComposeOrder.SINGLE,null); | |||||
| return super.createDBMainOrder(tenantEntity,user, payment,null, payWay, EnumComposeOrder.SINGLE,null); | |||||
| } | } | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, | |||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam, | |||||
| List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | ||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, platPushOrderList, payWay, EnumComposeOrder.SINGLE); | |||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay, EnumComposeOrder.SINGLE); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -39,14 +39,14 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi | |||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | ||||
| EnumPayWay payWay) { | EnumPayWay payWay) { | ||||
| return super.createDBMainOrder(tenantEntity, user, payment, payWay, EnumComposeOrder.PACKAGECOUPON,null); | |||||
| return super.createDBMainOrder(tenantEntity, user, payment,null, payWay, EnumComposeOrder.PACKAGECOUPON,null); | |||||
| } | } | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, | |||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam, | |||||
| List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | ||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, platPushOrderList, payWay, EnumComposeOrder.PACKAGECOUPON); | |||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay, EnumComposeOrder.PACKAGECOUPON); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -40,14 +40,14 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder | |||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | ||||
| EnumPayWay payWay) { | EnumPayWay payWay) { | ||||
| return super.createDBMainOrder(tenantEntity,user, payment, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,null); | |||||
| return super.createDBMainOrder(tenantEntity,user, payment, null, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,null); | |||||
| } | } | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, | |||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam, | |||||
| List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | ||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, platPushOrderList, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | |||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | |||||
| } | } | ||||
| @@ -39,14 +39,14 @@ public class OneNumberOneOrderBatchOrderAdapterService extends BaseBatchOrderAda | |||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment, | ||||
| EnumPayWay payWay) { | EnumPayWay payWay) { | ||||
| return super.createDBMainOrder(tenantEntity,user, payment, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,null); | |||||
| return super.createDBMainOrder(tenantEntity,user, payment, null,payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,null); | |||||
| } | } | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, | |||||
| public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam, | |||||
| List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) { | ||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, platPushOrderList, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH); | |||||
| return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH); | |||||
| } | } | ||||
| @Override | @Override | ||||