modify

Helius

2020-12-24 76f93da5aabffcd237be71e21c3ad7e8eb991804

modify

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

@@ -12,6 +12,7 @@
import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
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.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
@@ -128,7 +129,9 @@
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        orderListDto.setShopId(user.getShopId());
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
        }
        return AjaxResult.buildSuccessInstance(sysOrderService.findApiOrderListInPage(orderListDto, pageVo), sysOrderService.findApiOrderListTotal(orderListDto));
    }


 zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java

@@ -54,7 +54,11 @@
    }

    public String getIsFree() {
        return isFree;
        if ("1".equals(isFree)) {
            return "是";
        } else {
            return "否";
        }
    }

    public void setIsFree(String isFree) {