modify

Helius

2021-01-26 cde91db7a91dbd1406b3eb700880ff8343de7ccb

 zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java

@@ -14,8 +14,9 @@
import com.matrix.system.app.vo.ShoppingGoodsListVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.bean.ShoppingGoodsCategory;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
@@ -31,6 +32,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
@@ -51,6 +53,9 @@
    @Autowired
    private SysOrderService sysOrderService;

    @Autowired
    private SysShopInfoDao shopInfoDao;

    @ApiOperation(value = "获取商品类型列表", notes = "获取商品类型列表")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = ShoppingGoodsCategory.class)
@@ -59,9 +64,17 @@
    public AjaxResult findShoppingGoodsType() {
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);

        SysShopInfo zbShop = shopInfoDao.selectZbShop(user.getCompanyId());
        ShoppingGoodsCategory category = new ShoppingGoodsCategory();
        category.setShopId(user.getShopId());
        return AjaxResult.buildSuccessInstance(shoppingGoodsCategoryService.findByModel(category));
        category.setShopId(zbShop.getId());
        List<ShoppingGoodsCategory> list = new ArrayList<>();
        List<ShoppingGoodsCategory> byModel = shoppingGoodsCategoryService.findByModel(category);
        ShoppingGoodsCategory type = new ShoppingGoodsCategory();
        type.setName("全部");
        type.setParentId(0L);
        list.add(type);
        list.addAll(byModel);
        return AjaxResult.buildSuccessInstance(list);
    }

    @ApiOperation(value = "获取商品列表", notes = "获取商品列表")
@@ -70,7 +83,11 @@
    })
    @PostMapping(value = "/findShoppingGoods")
    public AjaxResult findShoppingGoods(@RequestBody @Validated ShoppingGoodsListDto shoppingGoodsListDto) {

        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if (!DataAuthUtil.hasAllShopAuth()) {
            shoppingGoodsListDto.setShopId(user.getShopId());
        }
        QueryUtil.setQueryLimitCom(shoppingGoodsListDto);
        return AjaxResult.buildSuccessInstance(shoppingGoodsService.findShoppingGoodsListForApi(shoppingGoodsListDto), shoppingGoodsService.findShoppingGoodsListTotalForApi(shoppingGoodsListDto));
    }

@@ -134,6 +151,7 @@
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
        }
        QueryUtil.setQueryLimitCom(orderListDto);
        return AjaxResult.buildSuccessInstance(sysOrderService.findApiOrderListInPage(orderListDto, pageVo), sysOrderService.findApiOrderListTotal(orderListDto));
    }