1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0...

jyy

2021-07-17 ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8

 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java

@@ -176,8 +176,11 @@
    public @ResponseBody
    AjaxResult showList(ShoppingGoods shoppingGoods, PaginationVO pageVo) {
        QueryUtil.setQueryLimit(shoppingGoods);
        pageVo.setOrder("desc");
        pageVo.setSort("createTime");
       if(StringUtils.isBlank(pageVo.getSort())){
           pageVo.setOrder("desc");
           pageVo.setSort("createTime");
       }

        //2表示查询总部产品
        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
            //仅查询本店产品