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