Merge branch 'master' into Bulbasaur

2021-06-01 15:51:50 +08:00
parent b70da68761 d01bd1581e
commit 6fb7322e3e
9 changed files with 56 additions and 11 deletions
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
@@ -39,7 +39,7 @@ public class PointsGoodsManagerController {
        AuthUser currentUser = UserContext.getCurrentUser();
        List<PointsGoodsVO> collect = new ArrayList<>();
        for (PointsGoodsVO i : pointsGoodsList) {
-            i.setStoreName("platform");
+            i.setStoreName(i.getGoodsSku().getStoreName());
            i.setStoreId(currentUser.getId());
            collect.add(i);
        }