Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java

@@ -1,9 +1,8 @@
package com.matrix.system.shopXcx.api.action;

import com.matrix.component.redis.RedisClient;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.app.authority.AppAuthorityManager;
import com.matrix.system.common.init.UserCacheManager;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.bean.SysOrderFlow;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -46,14 +45,12 @@
    @Autowired
    private AppAuthorityManager authorityManager;

    @Autowired
    private RedisClient redisClient;

    @Autowired
    private SysVipInfoDao vipInfoDao;

    @Autowired
    RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;

    @Autowired
    private SysOrderDao sysOrderDao;
@@ -75,7 +72,7 @@
    })
    @PostMapping(value = "/findUserOrderList")
    public AjaxResult findUserOrderList(@RequestBody @Validated ErpOrderListDto erpOrderListDto) {
        SysVipInfo vipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo vipInfo = userCacheManager.getLoginUser();
        
        erpOrderListDto.setVipId(vipInfo.getId());
        List<ErpOrderDetailVo> rows = sysOrderDao.selectErpOrderList(erpOrderListDto);