diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 23d6afaea..0db8c4760 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -138,7 +138,7 @@ public class CouponOrderExpiringSchedule { WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); wxSharingOrderDto.setcUserId(wxPayOrder.getcUserId()); wxSharingOrderDto.setMerchantId(0L); - wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode()); + wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); wxSharingOrderDto.setOrderId(wxPayOrder.getId()); wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 5d0f81ea6..428519990 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxProfitSharingOrder; import com.iformall.enums.EnumProfitSharingOrderStatus; import com.iformall.mapper.*; @@ -32,7 +33,10 @@ public class SharingOrderResultSchedule { List list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); for(WxProfitSharingOrder sharingOrder : list) { try { - wxProfitSharingOrderService.querySharingOrder(sharingOrder); + ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); + logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() + + " ID:" +sharingOrder.getId() + + " MSG:" + result.message); } catch (Exception e){ logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() + " ID:" +sharingOrder.getId() @@ -44,7 +48,10 @@ public class SharingOrderResultSchedule { list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); for(WxProfitSharingOrder sharingOrder : list) { try { - wxProfitSharingOrderService.querySharingOrder(sharingOrder); + ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); + logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() + + " ID:" + sharingOrder.getId() + + " MSG:" + result.message); } catch (Exception e){ logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() + " ID:" +sharingOrder.getId() diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index e7b3ff0e6..0bd8f22df 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -230,6 +230,7 @@ public enum ErrorCode{ PROFIT_SHARING_RECEIVER_ADD_FAILED(12037, "分账账户添加失败"), PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"), PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"), + PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), /** * 核销 */ diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java index 0ef05d653..b6ee77446 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumProfitSharingOrderType.java @@ -6,7 +6,8 @@ package com.iformall.enums; public enum EnumProfitSharingOrderType { PROFIT_SHARING_SINGLE(0, "单次分账"), PROFIT_SHARING_MULTI(1, "多次分账"), - PROFIT_SHARING_FINISH(2, "多次分账完结"), + PROFIT_SHARING_MULTI_FINISH(2, "多次分账完结"), + PROFIT_SHARING_SINGLE_FINISH(3, "单次分账完结"), ; public static EnumProfitSharingOrderType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 2bbffeaf7..5de4e3513 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -492,7 +492,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { shareOrder.setPayAmount(0); shareOrder.setOrderId(cardSpend.getId()); shareOrder.setShareAmount(cardInfo.getRemainingShareFeeAmount()); - shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode()); + shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode()); profitSharingOrderService.finishSharingOrder(shareOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 0d394cc78..bd782f4f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -423,12 +423,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingOrder record = new WxProfitSharingOrder(); WxAppinfo appInfo; - if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) { + if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()) + ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){ WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); appInfo = getAppinfo(wxPayOrder.getcUserId()); - } else { + } else if(wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()) + ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ WxCardSpend wxCardSpend = wxCardSpendMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); appInfo = getAppinfo(wxCardSpend.getOwnerId()); + } else { + return new ResultData(ErrorCode.PROFIT_SHARING_QUERY_UNKNOWN_TYPE); } WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); @@ -552,7 +556,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ public ResultData finishSharingOrder(WxSharingOrderDto sharingOrderDto) { final IdWorker idworker = IdWorker.get(); - if (!sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode())){ + if (!sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()) + && + !sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } @@ -564,7 +570,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingOrder record = new WxProfitSharingOrder(); //创建分账订单 Date currentDate = new Date(); - record = new WxProfitSharingOrder(); record.setId(idworker.nextId()); record.setTenantId(sharingOrderDto.getTenantId()); record.setTransactionId(sharingOrderDto.getTransactionId());