Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

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

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

import com.matrix.core.pojo.AjaxResult;
import com.matrix.biz.bean.BizUser;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.component.redis.RedisUserLoginUtils;
@@ -51,7 +51,7 @@
    @PostMapping(value = "/saveInvoice")
    public @ResponseBody
    AjaxResult saveInvoice(@RequestBody ShopInvoice shopInvoice) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        shopInvoice.setCreateBy(loginUser.getOpenId());
        shopInvoice.setUpdateBy(loginUser.getOpenId());
        shopInvoice.setUserId(loginUser.getOpenId());
@@ -82,7 +82,7 @@
    @PostMapping("/findProductComment")
    @ResponseBody
    public AjaxResult getProductCommentByUserId(@RequestBody ShopInvoice shopInvoice) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        String userId = loginUser.getOpenId();
        shopInvoice.setUserId(userId);
        List<ShopInvoice> list = invoiceDao.selectByUserId(shopInvoice);