code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

积分订单、用户下单积分数值判断

Browse Source
This commit is contained in:
lifenlong
2021-07-27 15:33:11 +08:00
parent 5a7440c5bf
commit 02f3bde2b4
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@@ -7,21 +7,15 @@ import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.token.Token;
import cn.lili.common.utils.StringUtils;
<<<<<<< HEAD
import cn.lili.common.verification.service.VerificationService;
=======
>>>>>>> master
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.permission.entity.dos.AdminUser;
import cn.lili.modules.permission.entity.dto.AdminUserDTO;
import cn.lili.modules.permission.entity.vo.AdminUserVO;
import cn.lili.modules.permission.service.AdminUserService;
import cn.lili.modules.permission.service.DepartmentService;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
View File

@@ -39,7 +39,7 @@ public class PointsGoodsManagerController {
List<PointsGoodsVO> collect = new ArrayList<>();
for (PointsGoodsVO i : pointsGoodsList) {
i.setStoreName(i.getGoodsSku().getStoreName());
i.setStoreId(UserContext.getCurrentUser().getStoreId());
i.setStoreId(i.getGoodsSku().getStoreId());
collect.add(i);
}
pointsGoodsService.addPointsGoods(collect);