Merge branch 'master' of http://192.168.20.122:3000/root/MemberCenter_DW.git

member-services/src/main/java/com/liangjian/dataplatform/member/controller/UserGrowthLogController.java

@@ -21,6 +21,15 @@ public class UserGrowthLogController {
     @Autowired
     private IUserGrowthLogService iUserGrowthLogService;
 
+    @GetMapping("/logById")
+    @ApiOperation(value = "通过id查询成长值记录")
+    public ResultObject<UserGrowthLog> query(@ApiParam(value = "id",required = true) @RequestParam String id) {
+        return iUserGrowthLogService.queryById(id)
+                .map(i -> ResultObject.success(i))
+                .orElse(ResultObject.error("找不到成长值记录"));
+    }
+
+
     @GetMapping("/logs")
     @ApiOperation(value = "查询成长值记录")
     public Page<UserGrowthLog> query(@ApiParam(value = "页数", required = true) @RequestParam Integer page,

member-services/src/main/java/com/liangjian/dataplatform/member/service/IUserGrowthLogService.java

@@ -3,12 +3,16 @@ package com.liangjian.dataplatform.member.service;
 import com.liangjian.dataplatform.member.entity.po.elasticsearch.UserGrowthLog;
 import org.springframework.data.domain.Page;
 
+import java.util.Optional;
+
 /**
  * @Author: 黄子奇
  * @Date: 2019/11/16
  */
 public interface IUserGrowthLogService {
 
+    Optional<UserGrowthLog> queryById(String id);
+
     Page<UserGrowthLog> queryBySecretPhone(String secretPhone, Integer page, Integer size);
 
     Page<UserGrowthLog> queryBySecretPhoneAndIncrease(String secretPhone, boolean increase, Integer page, Integer size);

member-services/src/main/java/com/liangjian/dataplatform/member/service/impl/UserGrowthLogService.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @Author: 黄子奇
@@ -22,6 +23,11 @@ public class UserGrowthLogService implements IUserGrowthLogService {
     @Autowired
     private UserGrowthLogRepository userGrowthLogRepository;
 
+    @Override
+    public Optional<UserGrowthLog> queryById(String id) {
+        return userGrowthLogRepository.findById(id);
+    }
+
     @Override
     public Page<UserGrowthLog> queryBySecretPhone(String secretPhone, Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page,size, Sort.Direction.DESC,"crtDate");

member-services/src/main/java/com/liangjian/dataplatform/member/service/impl/UserOrdersService.java

@@ -790,7 +790,7 @@ public class UserOrdersService implements IUserOrdersService {
         json.put("openid",openid);
         String retStr= null;
         try {
-            retStr = EsUtils.post(json,"https://mem.360lj.com/weixin/sendMsg");
+            retStr = EsUtils.post(json,"http://mem.360lj.com/weixin/sendMsg");
         } catch (Exception e) {
             e.printStackTrace();
         }

member-weixin-service/src/main/java/com/liangjian/dataplatform/member/controller/WeixinController.java

@@ -93,9 +93,9 @@ public class WeixinController extends DreamMsgControllerAdapter {
         String key = inMenuEvent.getEventKey();
         if("test_click".equals(key)) {
             String openid = inMenuEvent.getFromUserName();
-            String url = "https://mem.360lj.com/weixin/index?openid="+openid;
+            String url = "http://mem.360lj.com/weixin/index?openid="+openid;
             OutNewsMsg outNewsMsg = new OutNewsMsg(inMenuEvent);
-            outNewsMsg.addNews(new News("测试链接", "测试链接-描述","https://image.360lj.com/portal/image/logo-png.png", url));
+            outNewsMsg.addNews(new News("测试链接", "测试链接-描述","http://image.360lj.com/portal/image/logo-png.png", url));
             render(outNewsMsg);
         }
     }