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/WxReceiveAddressAction.java

@@ -2,7 +2,7 @@

import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.biz.bean.BizUser;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.constance.AppConstance;

@@ -37,7 +37,7 @@
    @PostMapping(value = "/saveReceiveAddress")
    public @ResponseBody
    AjaxResult saveReceiveAddress(@RequestBody ShopReceiveAddress receiveAddress) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        receiveAddress.setCreateBy(loginUser.getOpenId());
        receiveAddress.setUpdateBy(loginUser.getOpenId());
        receiveAddress.setAddrUserid(loginUser.getOpenId());
@@ -94,7 +94,7 @@
    @PostMapping("/findReceiveAddress")
    @ResponseBody
    public AjaxResult getByAddrUserId(@RequestBody ShopReceiveAddress receiveAddress) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        String userId = loginUser.getOpenId();
        receiveAddress.setAddrUserid(userId);
        List<ShopReceiveAddress> list = shopReceiveAddressDao.selectByModel(receiveAddress);
@@ -110,7 +110,7 @@
    @PostMapping("/findAddrByAddrId/{addrId}")
    @ResponseBody
    public AjaxResult getByAddrId(@PathVariable("addrId") Integer addrId) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        String userId = loginUser.getOpenId();
        ShopReceiveAddress params = new ShopReceiveAddress();
        params.setAddrUserid(userId);
@@ -145,7 +145,7 @@
    @PostMapping(value = "/updateReceiveAddress")
    public @ResponseBody
    AjaxResult updateReceiveAddress(@RequestBody ShopReceiveAddress receiveAddress) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        receiveAddress.setCreateBy(loginUser.getOpenId());
        receiveAddress.setUpdateBy(loginUser.getOpenId());
        receiveAddress.setAddrUserid(loginUser.getOpenId());