bug修复

935090232@qq.com

2021-07-29 6e670a95d253ffef6d8baf66adb7bc08e6ea14e3

bug修复

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

@@ -75,11 +75,11 @@
            vipInfoListDto.setOrder("asc");
        }


        int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
        int limit = vipInfoListDto.getPageSize();
        vipInfoListDto.setOffset(offset);
        vipInfoListDto.setLimit(limit);





 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -1241,7 +1241,8 @@
            if(zsConsumeAchieve){
                if(sysOrderItem.getPrice()>0){

                    //大于0 不修改金额

                    

                }else{
                    //等于0取原价

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -17,6 +17,7 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
@@ -429,10 +430,10 @@
    @Override
    public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
        //todo 会员查询单独做控制
//        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
//        if (!DataAuthUtil.hasAllShopAuth()) {
//            vipInfoListDto.setShopId(sysUsers.getShopId());
//        }
        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if (!DataAuthUtil.hasAllCustomerAuth()) {
            vipInfoListDto.setShopId(sysUsers.getShopId());
        }
        QueryUtil.setQueryLimitCom(vipInfoListDto);
        return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
    }