fix:退款订单退业绩是订单状态的判断

Helius

2022-09-19 f2b9a83f75a4345cd42d008f3153c18f8f890cad

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

@@ -7,13 +7,13 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.bean.SystemDictionary;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.service.SystemDictionaryService;
@@ -301,6 +301,9 @@
            if(vipInfo.getShopId()==null){
                vipInfo.setShopId(users.getShopId());
            }
            if(vipInfo.getCompanyId()==null){
                vipInfo.setCompanyId(users.getCompanyId());
            }
            return add(vipInfoService, vipInfo, "会员信息");
        }
    }
@@ -334,8 +337,14 @@
    @RequestMapping(value = "/del")
    public @ResponseBody
    AjaxResult del(String keys) {

        return remove(vipInfoService, keys);
            List<Long> ids = StringUtils.strToCollToLong(keys, ",");
            int i = vipInfoService.removeLogic(ids);
            if (i > 0) {
                return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功删除" + i + "条数据");
            } else {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "删除失败");
            }
//        return remove(vipInfoService, keys);
    }

    /**