qxy 3 kuukautta sitten
vanhempi
commit
0fb390d3be

+ 0 - 40
alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -233,45 +233,6 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
         OrderCouponMiddle orderCouponMiddle = orderCouponMiddleMapper.selectOne(new LambdaQueryWrapper<OrderCouponMiddle>().eq(OrderCouponMiddle::getCouponCode, quanCode));
         if (!StringUtils.isEmpty(orderCouponMiddle)) {
             LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserOrder>().eq(LifeUserOrder::getId, orderCouponMiddle.getOrderId()));
-            //CouponType 类型为 1:代金券 2:团购套餐
-            if (lifeUserOrder.getCouponType() == 1) {
-                orderCouponMiddle.setStatus(2);
-                orderCouponMiddle.setUsedTime(new Date());
-                orderCouponMiddleMapper.updateById(orderCouponMiddle);
-                //通过订单id查询中间表 如果该订单下所有劵都为已核销状态更改订单表状态为已核销
-                List<OrderCouponMiddle> couponMiddleList = orderCouponMiddleMapper.selectList(new LambdaQueryWrapper<OrderCouponMiddle>()
-                        .eq(OrderCouponMiddle::getOrderId,lifeUserOrder.getId()));
-                boolean isExist =  couponMiddleList.stream()
-                        .allMatch(str -> str.getStatus()==2);
-                if(isExist){
-                    lifeUserOrder.setStatus(2);
-                    lifeUserOrderMapper.updateById(lifeUserOrder);
-                }
-                // TODO 抽成比例应该从商户里取
-                BigDecimal amounts = new BigDecimal(lifeUserOrder.getFinalPrice()).multiply(new BigDecimal(100));
-                BigDecimal commission = amounts.multiply(new BigDecimal(0.04)).setScale(0, RoundingMode.HALF_UP);
-                BigDecimal money = amounts.subtract(commission);
-
-                // 插入收入明细表数据
-                StoreIncomeDetailsRecord record = new StoreIncomeDetailsRecord();
-                record.setStoreId(Integer.parseInt(storeId));
-                record.setUserOrderId(orderCouponMiddle.getId());
-                record.setIncomeType(lifeUserOrder.getCouponType());
-                record.setBusinessId(orderCouponMiddle.getCouponId());
-                record.setCommission(commission.intValue());
-                record.setMoney(money.intValue());
-                storeIncomeDetailsRecordMapper.insert(record);
-
-                // 店铺账户余额增加
-                UpdateWrapper<StoreUser> updateWrapper = new UpdateWrapper();
-                updateWrapper.eq("store_id", storeId);
-                updateWrapper.eq("delete_flag", 0);
-                updateWrapper.setSql("money = money + " + money);
-                storeUserMapper.update(null, updateWrapper);
-                resultMap.put("code", "true");
-                resultMap.put("message", "核销成功");
-
-            } else if (lifeUserOrder.getCouponType() == 2) {
                 orderCouponMiddle.setStatus(2);
                 orderCouponMiddle.setUsedTime(new Date());
                 orderCouponMiddleMapper.updateById(orderCouponMiddle);
@@ -308,7 +269,6 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
                 storeUserMapper.update(null, updateWrapper);
                 resultMap.put("code", "true");
                 resultMap.put("message", "核销成功");
-            }
         } else {
             resultMap.put("code", "false");
             resultMap.put("message", "核销失败");