diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 7ae3ace2b..141253078 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -134,6 +134,17 @@ public class WxPressBatchController extends BaseController { wxPressBatchService.deleteItemById(record.getId(), getTenantInfo().getTenantId()); return new ResultData(); } + + @ApiOperation("详情接口") + @PostMapping("updateStatus") + public ResultData updateStatus(@RequestBody WxPressBatch record) { + if (null == record.getId() || null == record.getStatus()) { + return new ResultData(Result.ERROR,"参数错误"); + } + record.updateTenantInfo(getTenantInfo()); + wxPressBatchService.updateStatus(record); + return new ResultData(); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java index c44102679..970a2629c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java @@ -47,6 +47,8 @@ public interface WxPressBatchService { void deleteItemById(Long itemId,String tenantId); void deleteItemByBatchId(Long batchId,String tenantId); + void updateStatus(WxPressBatch pressBatch); + //验证砍价人规则 ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 83631f404..5d987703c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2588,7 +2588,7 @@ public class WxOrderServiceImpl implements WxOrderService { sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); - WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(orderId); + WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(wxOrder.getId()); sharingOrder.setMerchantShareAmount(share.getShareAmount()); sharingOrder.setMallRealRateAmount(share.getRateAmount()); sharingOrder.setRealRateAmount(share.getRealRateAmount()); @@ -2601,13 +2601,14 @@ public class WxOrderServiceImpl implements WxOrderService { sharingOrder.updateTenantInfo(wxPayOrder); sharingOrder.setTransactionId(wxPayOrder.getTransactionId()); wxProfitSharingOrderService.createSharingOrder(sharingOrder,wxPayOrder); - - + } else { logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId); } } catch (MallinkException e) { logger.error("微信分账: " + e.getMessage(),e); + } catch (Exception e){ + logger.error("微信分账"+e.getMessage(),e); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java index 267eb4072..bd7cfa1bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java @@ -4,6 +4,7 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -69,6 +70,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { @Override public void saveOrUpdate(WxPressBatch record) { if (null == record.getId()) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); wxPressBatchMapper.insert(record); @@ -106,8 +109,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { } } - @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + @Override public void deleteBatch(Long id, String tenantId) { wxPressBatchMapper.deleteById(id, tenantId); deleteItemByBatchId(id, tenantId); @@ -128,6 +131,17 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { iteq.setPressBatchId(batchId); wxPressBatchItemMapper.deleteAllItem(iteq); } + + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + @Override + public void updateStatus(WxPressBatch pressBatch) { + wxPressBatchMapper.updateWxPressBatchStatus(pressBatch); + WxPressBatchItem item = new WxPressBatchItem(); + item.updateTenantInfo(pressBatch); + item.setPressBatchId(pressBatch.getId()); + item.setPressBatchStatus(pressBatch.getStatus()); + wxPressBatchItemMapper.updateWxPressBatchStatus(item); + } @Override public ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId) { @@ -202,5 +216,4 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { } return null; } - } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index d9d82f3ec..86744a5c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -440,7 +440,8 @@ public class TtPayShareService extends PayShareBaseAdapterService{ List list = wxProfitSharingReceiverMapper.findList(psReceiverQ); if(list == null || list.isEmpty()){ - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg); + return null; +// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg); } if(list.size() > 1){ throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN.getCode(),"该商户分账帐号异常."); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java index 91d62f71c..532d14dd3 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java @@ -410,7 +410,8 @@ public class WxPayShareService extends PayShareBaseAdapterService{ psReceiverQ.setPlat(EnumAppPlat.WX.getCode()); List psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); if (null == psReceiverList || psReceiverList.size() == 0) { - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); + return null; +// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); }else { for (WxProfitSharingReceiver receiver:psReceiverList) { if (EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID.getCode().intValue() diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java index 21997bba5..434a83c90 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java @@ -149,9 +149,9 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ }else if (EnumPayMchType.TOTAL.getCode() == mchType) { receiver = wxProfitSharingReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); } - if (null == receiver) { - throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); - } +// if (null == receiver) { +// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号."); +// } return receiver; } diff --git a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml index 29ff0ef35..b3121f7d1 100644 --- a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml @@ -79,7 +79,7 @@ - update wx_press_batch_item set press_batch_status = #{status} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId} + update wx_press_batch_item set press_batch_status = #{pressBatchStatus} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId}