后台增加用户搜索列表

lidongdong

2023-11-24 d331c5475f0b07f36161a4464d92e32b6913b4e9

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java

@@ -14,6 +14,7 @@
import com.panzhihua.service_dangjian.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -34,10 +35,11 @@

    @Override
    public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
                     String goodName,String name,String cancelType,String communityId)
                     String goodName,String name,String cancelType,String communityId,String merchantId,String orderType)
    {
        Page page = new Page<NewFightShopping>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,communityId));
        return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,
                communityId, merchantId,orderType));
    }

    @Override
@@ -50,10 +52,6 @@
    public R addData(NewFightShoppingOrderVO item)
    {
        item.setOrderNumber(Snowflake.getId()+"");
        NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());

        int allMoney=0;
        int getMoney=Integer.valueOf(goods.getGoodPrice());


        // 查询用户积分账户
@@ -62,12 +60,28 @@
                        .eq(ComActIntegralUser::getUserId, item.getUserId())
                        .eq(ComActIntegralUser::getCommunityId, item.getCommunityId()));

        int allMoney=0;
        int getMoney=0;

        if(integralUserDO==null)
        {
            return R.fail("积分不足！");
        }

        allMoney=integralUserDO.getIntegralAvailableSum();


        //判断是线上下单  还是商家线下下单  1线上   2线下
        if(StringUtils.equals("1",item.getOrderType()))
        {
            NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
            getMoney=Integer.valueOf(goods.getGoodPrice());
        }
        else
        {
            getMoney=Integer.valueOf(item.getPalyMoney());

        }


        if(getMoney>allMoney)
        {
@@ -75,21 +89,33 @@
        }

        item.setCancelType("0");
        item.setPalyMoney(goods.getGoodPrice());
        item.setPalyMoney(getMoney+"");
        int num= baseMapper.addData(item);
        if(num>0)
        {
            //修改个人积分总额
            allMoney=allMoney-getMoney;
            NewFightIntegral integral=new NewFightIntegral();

            integral.setIntegralNum(allMoney+"");
            integral.setAddOrReduce(2);
            integral.setCommunityId(item.getCommunityId());
            integral.setUserId(item.getUserId());
            integral.setType("9");
            integral.setIdentityType("1");
            integral.setRemark("积分兑换商品");
            if(StringUtils.equals("1",item.getOrderType()))
            {

                integral.setType("9");
                integral.setIdentityType("1");
                integral.setRemark("积分兑换商品");
            }
            else
            {

                integral.setType("10");
                integral.setIdentityType("1");
                integral.setRemark("商家兑换商品");
                integral.setMerchantId(item.getMerchantId());
                integral.setIntegralNum(item.getPalyMoney());
            }
            integralUsersService.upIntegral(integral);

            return R.ok();
@@ -104,7 +130,7 @@
        {
            return R.ok();
        }
        return R.fail("添加失败");
        return R.fail("失败");
    }

    @Override
@@ -144,9 +170,21 @@
            integral.setAddOrReduce(1);
            integral.setCommunityId(order.getCommunityId());
            integral.setUserId(order.getUserId());
            integral.setType("9");
            integral.setIdentityType("1");
            integral.setRemark("积分兑换商品取消");

            if(StringUtils.equals("1",order.getOrderType()))
            {
                integral.setType("9");
                integral.setIdentityType("1");
                integral.setRemark("积分兑换商品取消");
            }
            else
            {
                integral.setType("10");
                integral.setIdentityType("1");
                integral.setRemark("商家兑换商品取消");
                integral.setMerchantId(order.getMerchantId());
                integral.setIntegralNum(order.getPalyMoney());
            }
            integralUsersService.upIntegral(integral);

            return R.ok();