淘礼金创建异常处理

admin

2019-08-26 d28bed1a1275131a5ca37f7da37961e2b518ac07

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -330,7 +330,7 @@


      // 是否存在奖励券

      boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

		


      // 2019.8.1开始返回维权信息

      Date august = null;

      try {

@@ -390,7 +390,7 @@
         if (hongBao == null) {

            hongBao = new BigDecimal(0);

         }

			


         if (CommonOrder.STATE_FK == orderState) {

            orderStateContent = "已付款";

         } else if (CommonOrder.STATE_JS == orderState) {

@@ -422,7 +422,7 @@
                     isPart = true;

                  }

               }

					


               if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

                  if (isPart) {

                     hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效

@@ -438,11 +438,14 @@
                     if (isPart) {

                        // 维权失效金额=维权的金额*获得的红包/结算金额

                        BigDecimal settlement = order.getSettlement();

                        BigDecimal wqHongbao = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);

                        weiQuanInfo.setWqHongBao("维权：-¥" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        BigDecimal wqHongbao = MoneyBigDecimalUtil

                              .div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);

                        weiQuanInfo.setWqHongBao(

                              "维权：-¥" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);

                     } else {

                        weiQuanInfo.setWqHongBao("维权：-¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        weiQuanInfo

                              .setWqHongBao("维权：-¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = new BigDecimal(0);

                     }

                     order.setWeiQuanInfo(weiQuanInfo);

@@ -533,7 +536,6 @@


         hongbaoInfo = hongBaoState_Str + hongbaoInfo;



			
         Map<String, String> hongBaoMap = new HashMap<String, String>();

         hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

         hongBaoMap.put("fontColor", hongbaoInfoFontColor);

@@ -836,9 +838,17 @@
               goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());

            }



            if (goods == null) {

               goods = new JDGoods();

               goods.setSkuName(itemOrder.getSkuName());

               goods.setPrice(itemOrder.getPrice());

               goods.setSkuId(itemOrder.getSkuId());

            }



            if (goods != null) {

               cog = CommonOrderGoodsFactory.create(goods);

            }



            cog.setCreateTime(new Date());

            cog.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(cog);

@@ -890,10 +900,9 @@
      if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))

         oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),

               commonOrder.getTradeId());

      else

         oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),

               commonOrder.getSourceType(), commonOrder.getOrderBy());



      else {

         throw new CommonOrderException(10, "交易ID为空");

      }

      if (oldCommonOrder == null)// 新增

      {

         commonOrder.setCreateTime(new Date());

@@ -905,6 +914,7 @@
      } else {// 修改

         // 已经结算，已经失效，状态未改变的订单不处理

         if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX

               || oldCommonOrder.getState() == CommonOrder.STATE_WQ

               || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {

            return oldCommonOrder;

         }

@@ -1020,8 +1030,14 @@
         Integer type, Integer orderState, String startTime, String endTime, Integer source)

         throws CommonOrderException {



      List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,

            startTime, endTime, source);

      List<CommonOrderVO> list = null;



      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,

               startTime, endTime, source);

      } else

         list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,

               source);



      if (list == null) {

         list = new ArrayList<CommonOrderVO>();

@@ -1152,6 +1168,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1167,6 +1185,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1182,6 +1202,8 @@
                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

                     } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                        order.setOtherState(1);

                     }

                  }

@@ -1198,7 +1220,11 @@
   @Override

   public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,

         String startTime, String endTime, Integer source) throws CommonOrderException {

      return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

      if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 搜索框无值或者按订单号搜索时都只搜索主订单

         return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,

               source);

      } else

         return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

   }



   @Override

@@ -1376,5 +1402,4 @@
      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }



}