| @@ -168,6 +168,7 @@ public class WxPayOrderController extends BaseController { | |||
| payOrder.setOrderId(orderId); | |||
| payOrder.setPayOrderStatus(status); | |||
| payOrder.setFailReason(reasonStr); | |||
| payOrder.updateTenantInfo(getTenantInfo()); | |||
| try { | |||
| //有价券支付成功 | |||
| @@ -220,6 +220,7 @@ public class WxPressOrderController extends BaseController { | |||
| orderUpdatePress.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); | |||
| orderUpdatePress.setPayment(wxCouponCVo.getSalePrice()); | |||
| orderUpdatePress.setUpdateDate(new Date()); | |||
| orderUpdatePress.updateTenantInfo(order); | |||
| // 保存订单 | |||
| wxOrderService.saveOrUpdate(orderUpdatePress); | |||
| // 发送砍价成功消息 | |||
| @@ -2181,7 +2181,7 @@ public class PosServiceImpl implements PosService { | |||
| if (couponOrderCVo != null) { | |||
| // 3. 成长值 | |||
| try { | |||
| WxOrder scoreOrder = orderMapper.selectById(couponOrderCVo.getOrderId()); | |||
| WxOrder scoreOrder = orderMapper.selectById(couponOrderCVo.getOrderId(),couponOrderCVo.getTenantId()); | |||
| int point = scoreRulesService.addScore2(merchantBUser,EnumScoreType.CONSUMPTION, scoreOrder, couponOrderCVo.getBusinessId()); | |||
| scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); | |||
| } catch (Exception e) { | |||
| @@ -2344,7 +2344,7 @@ public class PosServiceImpl implements PosService { | |||
| // 2. 积分, 成长值 | |||
| // 3. 成长值 | |||
| try { | |||
| WxOrder scoreOrder = orderMapper.selectById(order.getId()); | |||
| WxOrder scoreOrder = orderMapper.selectById(order.getId(),payOrder.getTenantId()); | |||
| scoreOrder.setPayment(neuPaymentAmount); | |||
| int point = scoreRulesService.addScore2(scoreOrder,EnumScoreType.CONSUMPTION, scoreOrder, merchant.getBusinessId()); | |||
| scoreCreditCalc.setScore(scoreCreditCalc.getScore() + point); | |||
| @@ -106,7 +106,7 @@ public class CouponOrderExpiringSchedule { | |||
| // 库存退回 | |||
| if(bStockBack) { | |||
| WxOrder order = wxOrderMapper.selectById(co.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(co.getOrderId(),co.getTenantId()); | |||
| if(order != null) { | |||
| wxOrderService.stockBack(order); | |||
| } | |||
| @@ -177,7 +177,7 @@ public class CouponOrderExpiringSchedule { | |||
| if(bStockBack) { | |||
| // 库存退回 | |||
| WxOrder order = wxOrderMapper.selectById(co.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(co.getOrderId(),co.getTenantId()); | |||
| if(order != null) { | |||
| wxOrderService.stockBack(order); | |||
| } | |||
| @@ -106,7 +106,7 @@ public interface WxPayOrderService { | |||
| * | |||
| * @param record | |||
| */ | |||
| void handlePayOrderStatusUpdateFree(WxPayOrder record); | |||
| //void handlePayOrderStatusUpdateFree(WxPayOrder record); | |||
| /** | |||
| * 保存或更新实体 | |||
| @@ -492,7 +492,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||
| return; | |||
| } | |||
| WxCardInfo cardInfo = wxCardInfoMapper.selectById(cardSpend.getCardId()); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId,cardInfo.getTenantId()); | |||
| WxMerchant merchant = wxMerchantMapper.selectById(cardSpend.getMerchantId()); | |||
| if (cardSpend != null && cardInfo != null && merchant != null) { | |||
| @@ -429,7 +429,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| private void doAfterVerify(WxCouponOrder couponOrder, WxMerchantBUser bUser, WxCoupon wxCoupon) { | |||
| // 成长值 | |||
| try { | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId()); | |||
| wxScoreRulesService.addScore2(bUser,EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); | |||
| } catch (Exception e) { | |||
| logger.error("成长值:" + e.getMessage()); | |||
| @@ -460,7 +460,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon, WxCUserBasicInfo cuUser) { | |||
| // 成长值 | |||
| try { | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId()); | |||
| wxScoreRulesService.addScore2(couponOrder,EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); | |||
| } catch (Exception e) { | |||
| logger.error("成长值:" + e.getMessage()); | |||
| @@ -715,7 +715,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| @Override | |||
| public boolean sendCouponAfterVerify(WxCouponOrder couponOrder, WxMerchantBUser bUser) { | |||
| // 核销发券 | |||
| WxOrder wxOrder = wxOrderMapper.selectById(couponOrder.getOrderId()); | |||
| 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); | |||
| @@ -729,7 +729,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| @Override | |||
| public boolean sendCouponAfterMicroPay(TenantEntity tenantEntity, Long orderId, Long cUserId) { | |||
| // B端刷卡支付发券 | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId); | |||
| 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); | |||
| @@ -748,7 +748,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||
| @Override | |||
| public void sendVerifyMsg(WxCouponOrder couponOrder, WxMerchantBUser bUser, boolean hadSentCoupon) { | |||
| // 1. get order info | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId(),couponOrder.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("找不到订单信息"); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -296,7 +296,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) | |||
| public ResultData toOrderGroup(WxOrderGroup wxOrderGroup) { | |||
| WxOrder orderTemp = wxOrderMapper.selectById(wxOrderGroup.getOrderId()); | |||
| WxOrder orderTemp = wxOrderMapper.selectById(wxOrderGroup.getOrderId(),wxOrderGroup.getTenantId()); | |||
| if (orderTemp == null) { | |||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | |||
| } | |||
| @@ -150,7 +150,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { | |||
| @Override | |||
| public void sendPressComplateMsg(WxOrder orderUpdatePress) { | |||
| // 1. get order info | |||
| WxOrder order = wxOrderMapper.selectById(orderUpdatePress.getId()); | |||
| WxOrder order = wxOrderMapper.selectById(orderUpdatePress.getId(),orderUpdatePress.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("找不到订单信息"); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -1560,7 +1560,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public int updateOrderStatus(WxOrder updateOrder, EnumOrderStatus enumOrderStatus) { | |||
| Date currentDate = new Date(); | |||
| WxOrder oldOrder = wxOrderMapper.selectById(updateOrder.getId()); | |||
| WxOrder oldOrder = wxOrderMapper.selectById(updateOrder.getId(),updateOrder.getTenantId()); | |||
| if (!oldOrder.getOrderStatus().equals(enumOrderStatus.getCode())) { | |||
| // 状态已更新,库存不退回, 保证不会多退 | |||
| switch (enumOrderStatus) { | |||
| @@ -1716,7 +1716,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| wxPayOrder.setOrderId(orderId); | |||
| wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||
| wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId,tenantEntity.getTenantId()); | |||
| WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(wxOrder.getProductId()); | |||
| if (wxPayOrder != null && wxMerchantBUser != null && | |||
| @@ -217,7 +217,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| try { | |||
| // 1. check 订单 | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),appInfo.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -408,7 +408,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| try { | |||
| // 1. check 订单 | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),appInfo.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -535,7 +535,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), "payOrder not found"); | |||
| } | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),payOrder.getTenantId()); | |||
| if (order == null) { | |||
| return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), "Order not found"); | |||
| } | |||
| @@ -783,7 +783,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| "is paid success , orderId : " + record.getOrderId()); | |||
| return null; | |||
| } | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),record.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay success handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -994,7 +994,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| public void handleMicroOrderPaySuccessForVerify(WxMerchantBUser user, WxPayOrder record,EnumPayWay payWay) { | |||
| Date currentDate = new Date(); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),record.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay success handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -1090,7 +1090,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| "is complete, orderId : " + record.getOrderId()); | |||
| return; | |||
| } | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId(),record.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -1181,22 +1181,22 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||
| */ | |||
| } | |||
| @Override | |||
| public void handlePayOrderStatusUpdateFree(WxPayOrder record) { | |||
| //检查数据合理性 | |||
| WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| if (order == null) { | |||
| logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| } | |||
| if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | |||
| WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(order.getCUserId(),order.getFinalTenantId()); | |||
| if (user == null) { | |||
| logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||
| } | |||
| } | |||
| } | |||
| // @Override | |||
| // public void handlePayOrderStatusUpdateFree(WxPayOrder record) { | |||
| // //检查数据合理性 | |||
| // WxOrder order = wxOrderMapper.selectById(record.getOrderId()); | |||
| // if (order == null) { | |||
| // logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| // throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| // } | |||
| // if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | |||
| // WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(order.getCUserId(),order.getFinalTenantId()); | |||
| // if (user == null) { | |||
| // logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | |||
| // throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||
| // } | |||
| // } | |||
| // } | |||
| @Override | |||
| public PageInfo<WxPayOrder> listAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize) { | |||
| @@ -129,7 +129,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); | |||
| } | |||
| WxOrder wxOrder = wxOrderMapper.selectById(wxCouponOrder.getOrderId()); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(wxCouponOrder.getOrderId(),wxCouponOrder.getTenantId()); | |||
| if (wxOrder == null) { | |||
| logger.error("订单ID不存在:" + couponOrderId); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -316,7 +316,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public ResultData createRefundOrderFromMicroPay(WxAppinfo appInfo, Long orderId, EnumPayType payType, Long bUserId) { | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId,appInfo.getTenantId()); | |||
| if (payType == EnumPayType.PAY_B_REFUND) { | |||
| logger.info("B端发起退款: bUserId-" + bUserId); | |||
| @@ -500,7 +500,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| return; | |||
| } | |||
| WxOrder order = wxOrderMapper.selectById(refundOrder.getOrderId()); | |||
| WxOrder order = wxOrderMapper.selectById(refundOrder.getOrderId(),refundOrder.getTenantId()); | |||
| if (order == null) { | |||
| logger.error("pay success handle, order " + refundOrder.getOrderId() + " not found , refundId : " + refundOrder.getId()); | |||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -582,7 +582,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public ResultData returnMoney(WxAppinfo appInfo, Long orderId) { | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId); | |||
| WxOrder wxOrder = wxOrderMapper.selectById(orderId,appInfo.getTenantId()); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| Date currentDate = new Date(); | |||
| // wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||