Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java

@@ -73,10 +73,10 @@


   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;

	


   @Resource

   private ConfigService configService;

	


   @Resource

   private AdminUserService adminUserService;



@@ -132,7 +132,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException {

      BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);

@@ -176,7 +176,7 @@
    */

   private void paySuccess(BanLiShopOrder order) {

      ThreadUtil.run(new Runnable() {

			


         @Override

         public void run() {

            long[] targetUids = new long[] { 3L, 4L };

@@ -191,11 +191,10 @@
            }

         }

      });

		
		


   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void refund(Long orderId) throws BanLiShopOrderException {

      // 订单退款

@@ -392,4 +391,48 @@
      }

   }



   @Transactional(rollbackFor = Exception.class)

   @Override

   public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException {



      BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);

      if (order == null)

         return;

      // 退款

      if (order.getState() == BanLiShopOrder.STATE_NO_PAY) {// 状态还是未支付

         // 退款红包

         if (order.getHongBaoPaymentState() != null

               && order.getHongBaoPaymentState() == BanLiShopOrder.PAY_STATE_PAID) {

            BanLiShopGoods goods = banLiShopGoodsService.selectByPrimaryKey(order.getGoods().getId());

            BanLiShopGoodsClass goodsClass = banLiShopGoodsClassService

                  .selectByPrimaryKey(goods.getGoodsClass().getId());

            BanLiShopGoodsSets set = banLiShopGoodsSetService.selectByPrimaryKey(order.getGoodsSet().getId());

            // 红包退款

            RedPackDetail detail = null;

            try {

               detail = RedPackDetailFactory.createShopOrderDrawBack(orderId, order.getUid(), goodsClass.getName(),

                     set.getName(), order.getHongBaoPayment());

            } catch (RedPackDetailException e) {

               e.printStackTrace();

            }



            if (detail == null)

               throw new BanLiShopOrderException(4, "红包详情失败");

            try {

               redPackBalanceService.addRedPack(order.getUid(), order.getHongBaoPayment(), detail);

            } catch (RedPackBalanceException e) {

               throw new BanLiShopOrderException(5, "红包退款失败");

            }



            BanLiShopOrder update = new BanLiShopOrder(order.getId());

            update.setHongBaoPaymentState(BanLiShopOrder.PAY_STATE_REFUND);

            update.setUpdateTime(new Date());

            banLiShopOrderService.udpateSelectiveByPrimaryKey(update);

         }



         banLiShopOrderService.invalidOrderByOrderId(orderId, stateDesc);

      }



   }



}