营销记录

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -61,7 +61,7 @@ import com.google.common.collect.Lists;
 * @date 2022年10月28日 上午9:57:23
 *
  */
-
+@RestController
 public class MemberMarketingController extends WebBaseController {
 
     private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(MemberMarketingController.class);
@@ -76,8 +76,8 @@ public class MemberMarketingController extends WebBaseController {
     private WechatMarketingService wechatMarketingService;
     @Autowired
     private AiMemberLogApiService aiMemberLogApiService;
-/*    @Autowired
-    private CustomSettingApiService customSettingApiService;*/
+    @Autowired
+    private CustomSettingApiService customSettingApiService;
     @Autowired
     private CouponCardService couponCardService;
     @Autowired
@@ -291,12 +291,12 @@ public class MemberMarketingController extends WebBaseController {
             }
             Map<String, Object> param = new HashMap<>();
             param.put("dict_type", "marketing_activity_scene");
-            /*ServiceResponse<Page<JSONObject>> dictRes = customSettingApiService.page("tab_business_dict", param, 1, 20);
+            ServiceResponse<Page<JSONObject>> dictRes = customSettingApiService.page("tab_business_dict", param, 1, 20);
             List<JSONObject> dictList = dictRes.getResult().getResult();
             Map<String, String> dictCodeMapName = new HashMap<>();
             for (JSONObject jsonObject : dictList) {
                 dictCodeMapName.put(jsonObject.getString("dict_code"), jsonObject.getString("dict_name"));
-            }*/
+            }
             Page<AiMemberLogListVO> resultPage = EntityUtil.changeEntityByJSON(Page.class, page);
             List<AiMemberLogListVO> voList = new ArrayList<>();
             for (AiMemberLogListDTO dto : list) {
@@ -309,7 +309,7 @@ public class MemberMarketingController extends WebBaseController {
                 if (activityScene == null) {
                     vo.setActivityScene(null);
                 } else {
-                    //vo.setActivityScene(dictCodeMapName.get(activityScene.toString()));
+                    vo.setActivityScene(dictCodeMapName.get(activityScene.toString()));
                 }
                 voList.add(vo);
             }