rcoketmq集中管理

admin

2020-07-01 c54fb6a88876be994906d57d2d18e844686964d0

 fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java

@@ -293,7 +293,7 @@
         BigDecimal money = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, buyerLevel);

         // 免单处理

         boolean mianDan = false;

         List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,

         List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),

               commonOrder.getOrderNo());

         if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单

            BigDecimal payMent = commonOrder.getPayment();

@@ -316,7 +316,7 @@
         if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {

            if (mianDan) {

               try {

                  userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                  userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

               } catch (Exception e) {

                  e.printStackTrace();

                  throw new HongBaoException(12, "免单券退款出错");

@@ -518,7 +518,7 @@
               if (goods != null) {

                  try {

                     if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),

                           commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))

                           commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))

                        mianDanMoney = payMent;

                  } catch (NumberFormatException e) {

                     throw new HongBaoException(10, "免单商品处理出错");

@@ -531,7 +531,7 @@
         } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效

            commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0

            try {

               userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

               userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

            } catch (Exception e) {

               e.printStackTrace();

            }