Quellcode durchsuchen

fix pay v3

release_toaliyun_real
zhengfangyuan vor 3 Jahren
Ursprung
Commit
24f076497f
28 geänderte Dateien mit 106 neuen und 84 gelöschten Zeilen
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  3. +24
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  4. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
  5. +5
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  6. +2
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java
  7. +2
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java
  8. +2
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java
  9. +2
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java
  10. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  11. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  12. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  13. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java
  14. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  15. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  16. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
  17. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java
  18. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  19. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  20. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
  21. +5
    -20
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  22. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java
  23. +4
    -3
      mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
  24. +7
    -6
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
  25. +9
    -7
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
  26. +6
    -6
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
  27. +7
    -6
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java
  28. +7
    -6
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Datei anzeigen

@@ -187,7 +187,7 @@ public class WxOrderController extends BaseController {
return new ResultData(ErrorCode.COUPON_IS_NOT_FREE);
}
// 免费券
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,EnumPayVersion.NO_VERSION);
order = wxOrderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,user, coupon, 1,
wxCouponChannel, orderSaveDto.getFormId(), null,null,EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT,EnumPayVersion.NO_VERSION,
EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null);


+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java Datei anzeigen

@@ -10,6 +10,7 @@ import com.iformall.domain.vo.WxCouponActionLogVo;
import com.iformall.domain.vo.WxCouponSendVo;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumCouponSendStatus;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCUserMapper;
@@ -102,7 +103,7 @@ public class WxCouponSendController extends BaseController {
wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode());
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode());
try {
wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId),EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT,getLoginBUser().getMerchantId(),getLoginBUser().getId());
wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId),EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT,EnumPayVersion.NO_VERSION,getLoginBUser().getMerchantId(),getLoginBUser().getId());
} catch (MallinkException e) {
logger.error("注券异常: ", e);
return new ResultData(e.getErrorCode(), e.getMessage());


+ 24
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Datei anzeigen

@@ -3,11 +3,13 @@ package com.iformall.controller;
import cn.binarywang.wx.miniapp.api.WxMaService;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseCUserEntity;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.tt.TtCUser;
import com.iformall.enums.EnumAppPlat;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.enums.EnumScoreType;
import com.iformall.exception.MallinkException;
@@ -66,6 +68,9 @@ public class BaseController {
@Autowired
private MemCouponFromDspService memCouponFromDspService;
@Autowired
private WxPayAccountService wxPayAccountService;
@Autowired
@Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> objectCommonRedisTemplate;
@@ -134,6 +139,25 @@ public class BaseController {
}
return appInfo;
}
public EnumPayVersion getPayVersion() {
WxAppinfo appinfo = getCurrentApp();
if ( null == appinfo) {
throw new MallinkException(ErrorCode.USER_APPINFO_NOT_EXIST);
}
WxPayAccount payAccount = RedisCacheUtils.getCacheObject(objectCommonRedisTemplate, "payAccount:"+appinfo.getPayId(), WxPayAccount.class);
if (null == payAccount) {
payAccount = wxPayAccountService.getById(appinfo.getPayId());
if (null != payAccount) {
RedisCacheUtils.cache(objectCommonRedisTemplate, "payAccount:"+appinfo.getPayId(), payAccount, 24*60*60);
}
}
if (null == payAccount) {
throw new MallinkException(ErrorCode.USER_APPINFO_NOFUND_PAYACCOUNT);
}
return EnumPayVersion.getEnum(payAccount.getPayVersion());
}

/**
* 微信端获取当前用户 wx_c_user,非会员


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java Datei anzeigen

@@ -101,7 +101,7 @@ public class WxCouponPasswordController extends BaseController {

// 3. 领取free coupon
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,payVersion);
WxOrder order = orderService.saveFreeOrderForCoupon(new Date(),false,composeOrder,member, coupon, 1,
null, formId, couponPassword.getId(),null,payWay,payVersion,
EnumOrderShopingType.ONLINE_PURCHASE.getCode(),null);


+ 5
- 5
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Datei anzeigen

@@ -37,6 +37,7 @@ import com.iformall.service.pay.entity.PayExtraParam;
import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil;
import com.iformall.utils.MaUtil;
import com.iformall.utils.RedisCacheUtils;
import com.iformall.utils.RedisLock;

import io.swagger.annotations.Api;
@@ -103,7 +104,6 @@ public class WxOrderController extends BaseController {
@Autowired
RedisLock redisLock;
//券包下单的逻辑和组合下单的逻辑差不错,但是库存走的是券包的库存,子订单的分账需要调用多次分账
@ApiOperation(value = "券包下单,", notes = "[{\"signleOrder\":{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"},\"count\":8},]")
@PostMapping("couponPackageSave")
@@ -114,7 +114,7 @@ public class WxOrderController extends BaseController {
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.PACKAGECOUPON,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo(),this.getCurrentApp());
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.PACKAGECOUPON,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo(),this.getPayVersion());
}
@ApiOperation(value = "商品购物车组合下单", notes = "[{\"signleOrder\":{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"},\"count\":8},]")
@@ -126,7 +126,7 @@ public class WxOrderController extends BaseController {
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
return wxOrderService.composeSaveOrder(true,EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo(),this.getCurrentApp());
return wxOrderService.composeSaveOrder(true,EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,orderSaveDto,memberId,EnumPayWay.PAY_WAY_WECHAT,getTenantInfo(),this.getPayVersion());
}

@ApiOperation(value = "券购物车组合下单", notes = "[{\"signleOrder\":{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"},\"count\":8},]")
@@ -138,7 +138,7 @@ public class WxOrderController extends BaseController {
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,orderSaveDto,memberId,getPayWay(),getTenantInfo(),this.getCurrentApp());
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,orderSaveDto,memberId,getPayWay(),getTenantInfo(),this.getPayVersion());
}
@ApiOperation(value = "单个券单个订单,卡(分账导致无法批量下单)、拼团,砍价用", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@@ -159,7 +159,7 @@ public class WxOrderController extends BaseController {
dto.setSignleOrder(orderSaveDto);
dto.setCount(1);
list.add(dto);
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,list,memberId,getPayWay(),getTenantInfo(),this.getCurrentApp());
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,list,memberId,getPayWay(),getTenantInfo(),this.getPayVersion());
}

@AuthIgnore


+ 2
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarCYFCallBackController.java Datei anzeigen

@@ -9,6 +9,7 @@ import com.iformall.domain.vo.WxCarCYFVo;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.*;
import com.iformall.service.park.impl.cyf.CYFUtil;
@@ -118,7 +119,7 @@ public class WxCarCYFCallBackController extends BaseController {
boolean bFirst = true;
for (WxCUserCar userCar : userCarList) {
userCar.setParentTenantId(park.getParentTenantId());
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP,EnumPayVersion.NO_VERSION);
WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId());
if(cUser != null){
if(bFirst) {


+ 2
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java Datei anzeigen

@@ -10,6 +10,7 @@ import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumETCPCode;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
@@ -396,7 +397,7 @@ public class WxCarETCPCallBackController extends BaseController {
boolean bFirst = true;
for (WxCUserCar userCar : userCarList) {
userCar.setParentTenantId(park.getParentTenantId());
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP,EnumPayVersion.NO_VERSION);
WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId());
if(cUser != null){
if(bFirst) {


+ 2
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarTJDCallBackController.java Datei anzeigen

@@ -7,6 +7,7 @@ import com.iformall.domain.po.*;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.*;
import com.iformall.service.park.impl.tjd.TJDUtil;
@@ -170,7 +171,7 @@ public class WxCarTJDCallBackController extends BaseController {
boolean bFirst = true;
for (WxCUserCar userCar : userCarList) {
userCar.setParentTenantId(park.getParentTenantId());
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP,EnumPayVersion.NO_VERSION);
WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),park.getFinalTenantId());
if(cUser != null){
if(bFirst) {


+ 2
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java Datei anzeigen

@@ -10,6 +10,7 @@ import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumETCPCode;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
@@ -210,7 +211,7 @@ public class WxParkCallBackBaseController extends BaseController {
boolean bFirst = true;
for (WxCUserCar userCar : userCarList) {
userCar.setParentTenantId(wxCarCmdLog.getParentTenantId());
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar,EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP,EnumPayVersion.NO_VERSION);
WxCUserBasicInfo cUser = wxCUserBasicInfoService.getById(userCar.getCUserId(),wxCarCmdLog.getFinalTenantId());
if(cUser != null){
if(bFirst) {


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java Datei anzeigen

@@ -192,7 +192,7 @@ public class CouponSendSchedule {

// 发放免费券
try {
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs,cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,null,null);
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs,cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,EnumPayVersion.NO_VERSION,null,null);
wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(),0L);
} catch (Exception e) {
logger.error("定时发券:发券失败 levelId=" + l.getId() + " couponId=" + cs.getCouponId() + " userId=" + cu.getId() + e.getMessage());
@@ -323,7 +323,7 @@ public class CouponSendSchedule {
for (WxCUserBasicInfo cu : newUserList) {
// 发放生日券
try {
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(),cs, cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,null,null);
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(),cs, cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,EnumPayVersion.NO_VERSION,null,null);
wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(), 0L);
couponSendedUsers.add(cu);
} catch (Exception e) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Datei anzeigen

@@ -98,6 +98,7 @@ public enum ErrorCode{
MEMBER_IS_LOCKED(2010, "当前会员已被锁定"),
USER_BIRTHDATE_AFTER(2109, "出生日期大于当前日期"),
USER_APPINFO_NOT_EXIST(2110,"当前登录用户APP为空"),
USER_APPINFO_NOFUND_PAYACCOUNT(2111,"当前app找不到payAccount"),

/**
* 商场/商户


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java Datei anzeigen

@@ -59,8 +59,8 @@ public class WxOrder extends TenantEntity {
private Long productId;
@io.swagger.annotations.ApiModelProperty(value="类型(0:券,1:B刷卡支付,2:C扫码支付,3:储值卡, 10:POS支付)",name="type")
private Integer type;
// @io.swagger.annotations.ApiModelProperty(value = "支付渠道EnumPayWay", name = "payVendor")
// private Integer payVendor;
@io.swagger.annotations.ApiModelProperty(value = "支付渠道EnumPayWay", name = "payVendor")
private Integer payVendor;
@io.swagger.annotations.ApiModelProperty(value = "支付渠道版本EnumPayVersion", name = "payVersion")
private Integer payVersion;
@io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType")


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java Datei anzeigen

@@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.WxCouponSend;
import com.iformall.domain.vo.WxCouponSendVo;
import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;

public interface WxCouponSendService {
@@ -55,7 +56,7 @@ public interface WxCouponSendService {
* @param cUserId
* @param type 2:停车发券 3:核销发券
*/
boolean sendCouponToUser(EnumCouponSendSendType type, Object param,EnumPayWay payWay);
boolean sendCouponToUser(EnumCouponSendSendType type, Object param,EnumPayWay payWay,EnumPayVersion payVersion);

void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status);

@@ -98,7 +99,7 @@ public interface WxCouponSendService {
*
* @param wxCouponSend
*/
void handSel(WxCouponSend wxCouponSend,Long cUserId,EnumPayWay payWay,Long merchantId,Long bUserId) ;
void handSel(WxCouponSend wxCouponSend,Long cUserId,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId) ;
List<WxCouponSendVo> findListVo(WxCouponSend record);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxOrderService.java Datei anzeigen

@@ -249,7 +249,7 @@ public interface WxOrderService {
//ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity);
ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,
TenantEntity tenantEntity,WxAppinfo appinfo);
TenantEntity tenantEntity,EnumPayVersion payVersion);
//平台推送订单,如抖音支付2.0
ResultData platPushSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,Long cUserId,


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java Datei anzeigen

@@ -176,7 +176,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
}

try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("支付发券: " + e.getMessage());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java Datei anzeigen

@@ -173,7 +173,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
if(record.getCUserId() != null){

try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("支付发券: " + e.getMessage());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java Datei anzeigen

@@ -274,7 +274,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService {
// 发放免费券
WxCouponOrder couponOrder = null;
try {
couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(),wxCoupon, wxCoupon.getId(),null,EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND,null,null);
couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(),wxCoupon, wxCoupon.getId(),null,EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND,EnumPayVersion.NO_VERSION,null,null);
if (couponOrder != null) {
wxCouponActionLogService.addOne(couponOrder, wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId,0L);
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Datei anzeigen

@@ -1860,7 +1860,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
WxOrder wxOrder = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId());
if (wxOrder != null) {
try {
return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY);
return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("核销发券: " + e.getMessage(),e);
}
@@ -1874,7 +1874,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
WxOrder wxOrder = wxOrderMapper.selectById(orderId,tenantEntity.getTenantId());
if (wxOrder != null) {
try {
return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("B端刷卡支付发券: " + e.getMessage());
}


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Datei anzeigen

@@ -468,7 +468,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public boolean sendCouponToUser(EnumCouponSendSendType type, Object param,EnumPayWay payWay) {
public boolean sendCouponToUser(EnumCouponSendSendType type, Object param,EnumPayWay payWay,EnumPayVersion payVersion) {

TenantEntity tenantEntity;
Long cUserId;
@@ -557,7 +557,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
// 发放免费券
WxCouponOrder couponOrder = null;
try {
couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,send, send.getCouponId(), null,payWay,null,null);
couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,send, send.getCouponId(), null,payWay,payVersion,null,null);
if (couponOrder != null) {
bRet = true;

@@ -698,7 +698,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void handSel(WxCouponSend wxCouponSend, Long cUserId,EnumPayWay payWay,Long merchantId,Long bUserId) {
public void handSel(WxCouponSend wxCouponSend, Long cUserId,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId) {

WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId,wxCouponSend.getFinalTenantId());
if (Objects.isNull(wxCUserBasicInfo)) {
@@ -711,7 +711,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
}
couponSendList.forEach(cs -> {
// 发放免费券
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,cs, cs.getCouponId(), cs,payWay,merchantId,bUserId);
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,cs, cs.getCouponId(), cs,payWay,payVersion,merchantId,bUserId);
if (couponOrder != null) {
wxCouponActionLogService.addOne(couponOrder, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(),bUserId);
sendMsgForSendCoupon(couponOrder, cs, couponOrder, wxCUserBasicInfo);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java Datei anzeigen

@@ -456,7 +456,7 @@ public class WxGameServiceImpl implements WxGameService {
ocsd.setSignleOrder(orderSaveDto);
ocsd.setCount(1);
orderSave.add(ocsd);
ResultData resultData1 = wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame);
ResultData resultData1 = wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame,EnumPayVersion.WX_PAY_V2);

if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxComposeOrder){
WxComposeOrder order = (WxComposeOrder)resultData1.data;


+ 5
- 20
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Datei anzeigen

@@ -2091,7 +2091,7 @@ public class WxOrderServiceImpl implements WxOrderService {

// 交易发券
try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.C_ORDER, order,EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.C_ORDER, order,EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("订单发券:" + e.getMessage(),e);
}
@@ -2804,7 +2804,7 @@ public class WxOrderServiceImpl implements WxOrderService {

OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode());
//从这里开始,就需要锁住渠道的价格,不能修改
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrderByPushOrder(tenantEntity,user, allExtParam,platPushOrderList, payWay);
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrderByPushOrder(tenantEntity,user, allExtParam,platPushOrderList, payWay,payVersion);
Date orderDate = new Date();
WxOrder lastOrder = null;
WxCoupon lastCoupon = null;
@@ -2881,7 +2881,7 @@ public class WxOrderServiceImpl implements WxOrderService {

OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode());
//从这里开始,就需要锁住渠道的价格,不能修改
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(tenantEntity,user, orderSave, payWay);
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(tenantEntity,user, orderSave, payWay,payVersion);
Date orderDate = new Date();
WxOrder lastOrder = null;
for (int i = 0 ; i < orderSave.size(); i ++) {
@@ -3411,13 +3411,9 @@ public class WxOrderServiceImpl implements WxOrderService {

@Override
public ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,
TenantEntity tenantEntity,WxAppinfo appinfo) {
TenantEntity tenantEntity,EnumPayVersion payVersion) {
try {
if ( null == appinfo) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息");
}
if (null == composeOrderSaveDto || composeOrderSaveDto.size() <= 0 ) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息");
}
@@ -3440,20 +3436,9 @@ public class WxOrderServiceImpl implements WxOrderService {
ocsd.setWxCoupon(coupon);
}
WxPayAccount payAccount = RedisCacheUtils.getCacheObject(redisTemplate, "payAccount:"+appinfo.getPayId(), WxPayAccount.class);
if (null == payAccount) {
payAccount = wxPayAccountMapper.selectById(appinfo.getPayId());
if (null != payAccount) {
RedisCacheUtils.cache(redisTemplate, "payAccount:"+appinfo.getPayId(), payAccount, 24*60*60);
}
}
if (null == payAccount) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"app查询不到payAccount");
}
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy();
try {
WxComposeOrder order = proxy.saveOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay,payAccount.getPayVersion());
WxComposeOrder order = proxy.saveOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay,payVersion);
return new ResultData(order);
} catch (MallinkException e) {
logger.error("saveOrderForCoupon error.",e);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java Datei anzeigen

@@ -178,7 +178,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
}

try {
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA);
wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA,EnumPayVersion.NO_VERSION);
} catch (Exception e) {
logger.error("支付发券: " + e.getMessage());
}


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java Datei anzeigen

@@ -7,6 +7,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.dto.PlatPushOrderSaveDto;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.order.entity.WxComposeChildOrderPrice;
import com.iformall.service.order.entity.WxComposeOrder;
@@ -17,12 +18,12 @@ public interface OrderAdapterService {
* 数据库创建组合主订单,不是wxOrder.单个的模式不用创建
* @return
*/
WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay);
WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumPayVersion payVersion);
WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,int payment,EnumPayWay payWay);
WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,int payment,EnumPayWay payWay,EnumPayVersion payVersion);
//第三方平台推送过来的订单
WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay);
WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay,EnumPayVersion payVersion);
/**
* 获取支付时商品名称,供服务商API使用


+ 7
- 6
mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java Datei anzeigen

@@ -17,6 +17,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.dto.PlatPushOrderSaveDto;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumOrderShopingType;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.mapper.WxBatchOrderMapper;
import com.iformall.mapper.WxOrderMapper;
@@ -41,22 +42,22 @@ public class SingleOrderAdapterService extends BaseBatchOrderAdapterService {

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.SINGLE);
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay,payVersion, EnumComposeOrder.SINGLE);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, payment,null, payWay, EnumComposeOrder.SINGLE,null,null);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, payment,null, payWay,payVersion, EnumComposeOrder.SINGLE,null,null);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam,
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay, EnumComposeOrder.SINGLE);
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay,payVersion, EnumComposeOrder.SINGLE);
}
@Override


+ 9
- 7
mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java Datei anzeigen

@@ -22,6 +22,7 @@ import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumOrderShopingType;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCouponChannelService;
@@ -77,7 +78,7 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
protected WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumComposeOrder composeOrderType) {
protected WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumPayVersion payVersion,EnumComposeOrder composeOrderType) {
int payment = 0;
Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>();
Map<Long,WxCouponChannel> couponChannelMap = new HashMap<Long,WxCouponChannel>();
@@ -93,11 +94,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
couponChannelMap.put(wxCouponChannel.getId(), wxCouponChannel);
}
return createDBMainOrder(tenantEntity, user, payment, null,payWay, composeOrderType,couponChannelMap,couponMap);
return createDBMainOrder(tenantEntity, user, payment, null,payWay,payVersion, composeOrderType,couponChannelMap,couponMap);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
protected WxComposeOrder createDBMainOrderForPushOrders(TenantEntity tenantEntity,WxCUserBasicInfo user,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay,EnumComposeOrder composeOrderType) {
protected WxComposeOrder createDBMainOrderForPushOrders(TenantEntity tenantEntity,WxCUserBasicInfo user,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay,
EnumPayVersion payVersion,EnumComposeOrder composeOrderType) {
int payment = 0;
Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>();
Map<Long,WxCouponChannel> couponChannelMap = new HashMap<Long,WxCouponChannel>();
@@ -113,12 +115,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
couponChannelMap.put(wxCouponChannel.getId(), wxCouponChannel);
}
return createDBMainOrder(tenantEntity, user, payment, allExtParam,payWay, composeOrderType,couponChannelMap,couponMap);
return createDBMainOrder(tenantEntity, user, payment, allExtParam,payWay,payVersion, composeOrderType,couponChannelMap,couponMap);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
protected WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,int payment,String allExtParam,EnumPayWay payWay,EnumComposeOrder composeOrderType,
Map<Long,WxCouponChannel> couponChannelMap,Map<Long,WxCoupon> couponMap) {
protected WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,int payment,String allExtParam,EnumPayWay payWay,EnumPayVersion payVersion,
EnumComposeOrder composeOrderType,Map<Long,WxCouponChannel> couponChannelMap,Map<Long,WxCoupon> couponMap) {
//判断是否poi订单
Integer isTtPoiOrder = null;
try{
@@ -135,7 +137,7 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
order.updateTenantInfo(tenantEntity);
order.setPayment(payment);
order.setPayVendor(payWay.getCode());
order.setPayVersion(payVersion);
order.setPayVersion(payVersion.getCode());
order.setOrderType(composeOrderType.getCode());
order.setIsTtPoiOrder(isTtPoiOrder);
order.setCreateDate(new Date());


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java Datei anzeigen

@@ -31,22 +31,22 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.PACKAGECOUPON);
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay,payVersion, EnumComposeOrder.PACKAGECOUPON);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity, user, payment,null, payWay, EnumComposeOrder.PACKAGECOUPON,null,null);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity, user, payment,null, payWay,payVersion, EnumComposeOrder.PACKAGECOUPON,null,null);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam,
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay, EnumComposeOrder.PACKAGECOUPON);
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay,payVersion, EnumComposeOrder.PACKAGECOUPON);
}

@Override


+ 7
- 6
mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java Datei anzeigen

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.dto.PlatPushOrderSaveDto;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.order.entity.WxComposeOrder;
/**
@@ -32,22 +33,22 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay,payVersion, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, payment, null, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,null,null);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, payment, null, payWay,payVersion, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH,null,null);
}

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam,
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam, platPushOrderList, payWay,payVersion, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
}


+ 7
- 6
mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java Datei anzeigen

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.dto.PlatPushOrderSaveDto;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumPayVersion;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.order.entity.WxComposeOrder;

@@ -31,22 +32,22 @@ public class OneNumberOneOrderBatchOrderAdapterService extends BaseBatchOrderAda
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay,payVersion, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity, WxCUserBasicInfo user, int payment,
EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, payment, null,payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,null,null);
EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrder(tenantEntity,user, payment, null,payWay,payVersion, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,null,null);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrderByPushOrder(TenantEntity tenantEntity, WxCUserBasicInfo user,String allExtParam,
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
List<PlatPushOrderSaveDto> platPushOrderList, EnumPayWay payWay,EnumPayVersion payVersion) {
return super.createDBMainOrderForPushOrders(tenantEntity, user, allExtParam,platPushOrderList, payWay,payVersion, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
}

@Override


Laden…
Abbrechen
Speichern