Browse Source

/、update

release_toaliyun_real
xhxu 4 years ago
parent
commit
a353527fe7
11 changed files with 229 additions and 11 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  2. +200
    -0
      mallinkAdmin/src/main/resources/db/migration/V2021122200001__add_auser.sql
  3. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java
  4. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  5. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderStatus.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  10. +15
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  11. +5
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java View File

@@ -111,7 +111,7 @@ public class WxCouponOrderController extends BaseController {
WxAppinfo appinfo = appinfoPageInfo.getList().get(0);
if (appinfo != null) {
try {
wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_ADMIN_REFUND, null);
wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_ADMIN_REFUND, null,getUserId());
return new ResultData();
} catch (MallinkException e) {
logger.error(e.getMessage(),e);


+ 200
- 0
mallinkAdmin/src/main/resources/db/migration/V2021122200001__add_auser.sql View File

@@ -0,0 +1,200 @@
ALTER TABLE `mallink`.`wx_coupon_order_0`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_1`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_2`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_3`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_4`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_5`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_6`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_7`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_8`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_9`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_10`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_11`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_12`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_13`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_14`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_15`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_16`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_17`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_18`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_19`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_20`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_21`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_22`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_23`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_24`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_25`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_26`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_27`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_28`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_29`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_30`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_31`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_32`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_33`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_34`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_35`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_36`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_37`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_38`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_39`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_40`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_41`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_42`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_43`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_44`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_45`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_46`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_47`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_48`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_49`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_50`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_51`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_52`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_53`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_54`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_55`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_56`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_57`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_58`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_59`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_60`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_61`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_62`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_63`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_64`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_65`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_66`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_67`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_68`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_69`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_70`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_71`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_72`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_73`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_74`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_75`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_76`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_77`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_78`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_79`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_80`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_81`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_82`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_83`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_84`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_85`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_86`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_87`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_88`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_89`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_90`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_91`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_92`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_93`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_94`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_95`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_96`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_97`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_98`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;
ALTER TABLE `mallink`.`wx_coupon_order_99`
ADD COLUMN `a_user_id` bigint(20) COMMENT '操作券A端用户ID' AFTER `b_user_id`;

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java View File

@@ -73,7 +73,7 @@ public class WxRefundOrderController extends BaseController {
appinfo = wxAppinfoService.getList(appinfo).get(0);
// WxAppinfo appinfo = getAppInfo(bUser.getAppId());
try {
ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId());
ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId(), null);
return rd;
} catch (MallinkException e) {
logger.error(e.getMessage());


+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -652,7 +652,7 @@ public class PosServiceImpl implements PosService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_OVER_TIME);
}
if (couponOrderCVo.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()) {
logger.error("已作废: couponOrder-" + couponOrderIdStr);
logger.error("已退款: couponOrder-" + couponOrderIdStr);
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_INVALID);
}
if (couponOrderCVo.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()) {


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java View File

@@ -187,7 +187,7 @@ public class CouponOrderExpiringSchedule {
}

try {
wxRefundOrderService.createRefundOrder(appinfo, co.getId(), EnumPayType.PAY_AUTO_REFUND, null);
wxRefundOrderService.createRefundOrder(appinfo, co.getId(), EnumPayType.PAY_AUTO_REFUND, null,null);
} catch (MallinkException e) {
if (e.getErrorCode() == ErrorCode.REFUND_NOT_ALLOW.getCode()) {
} else {


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java View File

@@ -32,6 +32,8 @@ public class WxCouponOrder extends TenantEntity {
private Long ownerId;
@io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId")
private Long bUserId;
@io.swagger.annotations.ApiModelProperty(value = "操作券A端用户ID", name = "aUserId")
private Long aUserId;
@io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId")
private Long orderId;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderStatus.java View File

@@ -10,7 +10,7 @@ public enum EnumCouponOrderStatus {
COUPON_ORDER_USE_WAIT(0, "待使用"),//占库存
COUPON_ORDER_USED(1, "已核销"),//占库存
COUPON_ORDER_OVER_TIME(2, "已过期"),//占库存
COUPON_ORDER_INVALID(3, "已作废"),
COUPON_ORDER_INVALID(3, "已作废"),//退款

CARD_USING(4, "使用中"),//占库存
CARD_OVER_TIME(5, "已过期"),//占库存


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java View File

@@ -20,7 +20,7 @@ public interface WxRefundOrderService {
* @param bUserId b端退款Id,auto,admin,self可为null
* @return
*/
ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId);
ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId, Long aUserId);

/**
* 创建退款订单


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -1541,7 +1541,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_OVER_TIME);
}
if (couponOrderCVo.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()) {
logger.error("已作废: couponOrder-" + couponOrderCVo.getId());
logger.error("已退款: couponOrder-" + couponOrderCVo.getId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_INVALID);
}
if (couponOrderCVo.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()) {


+ 15
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java View File

@@ -124,7 +124,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId) {
public ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId, Long aUserId) {
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectById(couponOrderId,appInfo.getTenantId());
if (wxCouponOrder == null) {
logger.error("券ID不存在:" + couponOrderId);
@@ -153,11 +153,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_NOT_EQUAL);
}
} else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
logger.info("ADMIN端发起退款: bUserId-" + bUserId);
logger.info("ADMIN端发起退款: aUserId-" + aUserId);
} else if (payType == EnumPayType.PAY_AUTO_REFUND) {
logger.info("auto端发起退款");
} else {
logger.info("自己发起退款: cUserId-" + bUserId);
logger.info("自己发起退款");
}

if (wxOrder.getPayment() <= 0) {
@@ -223,6 +223,12 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
rOrder.setCUserId(wxOrder.getCUserId());
if (payType == EnumPayType.PAY_B_REFUND) {
rOrder.setDetail("["+bUserId+"]B端管理员操作退款"); //B端发起退款后存B端用户ID在此
}else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
rOrder.setDetail("["+aUserId+"]A端管理员操作退款");
} else if (payType == EnumPayType.PAY_AUTO_REFUND) {
rOrder.setDetail("auto端发起退款");
} else {
rOrder.setDetail("自己发起退款");
}
rOrder.setPaymentType(payType.getCode());
rOrder.setPayment(wxOrder.getPayment());
@@ -247,8 +253,13 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
}
if (payType == EnumPayType.PAY_B_REFUND) {
wxCouponOrder.setBUserId(bUserId);
wxCouponOrder.setAUserId(payType.getCode().longValue());
} else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
wxCouponOrder.setBUserId(payType.getCode().longValue());
wxCouponOrder.setAUserId(aUserId);
} else {
wxCouponOrder.setBUserId(payType.getCode().longValue());//其他退款模式将退款方式存入BUSERID
wxCouponOrder.setBUserId(payType.getCode().longValue());
wxCouponOrder.setAUserId(payType.getCode().longValue());
}
wxCouponOrder.setUpdateDate(currentDate);
try {


+ 5
- 0
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -10,6 +10,7 @@
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="owner_id" jdbcType="BIGINT" property="ownerId" />
<result column="b_user_id" jdbcType="BIGINT" property="bUserId" />
<result column="a_user_id" jdbcType="BIGINT" property="aUserId" />
<result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime" />
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus" />
@@ -74,6 +75,10 @@
and `b_user_id` = #{bUserId}
</if>

<if test=" null != aUserId ">
and `a_user_id` = #{aUserId}
</if>

<if test=" null != orderId ">
and `order_id` = #{orderId}
</if>


Loading…
Cancel
Save