微信小程序

src/main/java/com/ctrip/fun/golf/api/basic/VoucherMController.java

@@ -153,6 +153,15 @@ public class VoucherMController {
         return voucherService.queryListForPersonalCenter(voucherQuery);
     }
     
+
+    //获取所有的券
+    @ResponseBody
+    @Security
+    @RequestMapping(value = "/voucher/sendVoucherForMiniAppRegister/{token}", method = RequestMethod.POST)
+    public Object sendVoucherForMiniAppRegister(@PathVariable String token,@RequestBody VoucherQueryDto voucherQuery) {
+        return voucherService.sendVoucherForMiniAppRegister(voucherQuery);
+    }
+    
     //获取所有的券
     @ResponseBody
     @Security

src/main/java/com/ctrip/fun/golf/api/user/UserMController.java

@@ -446,36 +446,28 @@ public class UserMController {
     }
 
     /**
-     * 用户注册
+     * 小程序授权登录
      * 
      * @param registerBean
      * @return
      */
-    @SuppressWarnings("unchecked")
     @ResponseBody
     @RequestMapping(value = "/v1/loginMiniApp", method = RequestMethod.POST)
     public Object loginMiniApp(@RequestBody WeChatAppLoginReq  req) {
-    	MiniAppLoginResultBean miniAppLoginResultBean = userMService.loginMiniApp(req);
-        Map mp = new HashMap();
-        mp.put("miniAppLoginResultBean", miniAppLoginResultBean);
-        return mp;
+    	return userMService.loginMiniApp(req);
     }
  
     
     /**
-     * 用户注册
+     * 需要手机验证注册登录的用户
      * 
      * @param registerBean
      * @return
      */
-    @SuppressWarnings("unchecked")
     @ResponseBody
     @RequestMapping(value = "/v1/miniAppLoginByDynamicPassword", method = RequestMethod.POST)
-    public Object loginMiniApp(@RequestBody MiniAppLoginBean  req) {
-    	MiniAppLoginResultBean miniAppLoginResultBean = userMService.miniAppLoginByDynamicPassword(req);
-        Map mp = new HashMap();
-        mp.put("miniAppLoginResultBean", miniAppLoginResultBean);
-        return mp;
+    public Object miniAppLoginByDynamicPassword(@RequestBody WeChatAppLoginReq  req) {
+    	return  userMService.miniAppLoginByDynamicPassword(req);
     }
     
     

src/main/java/com/ctrip/fun/golf/service/basic/VoucherMService.java

@@ -164,6 +164,21 @@ public class VoucherMService extends BaseService {
         }
         return response;
     }
+    
+    
+	public Response<String> sendVoucherForMiniAppRegister(VoucherQueryDto query) {
+		Response<String> response = new Response<String>();
+        String uri = super.getServiceUri("uri.voucher.sendVoucherForMiniAppRegister");
+        HttpEntity<Request<VoucherQueryDto>> entity = new HttpEntity<Request<VoucherQueryDto>>(new Request<VoucherQueryDto>(null, query));
+        try {
+            response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<String>>() {}).getBody();
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+            return response;
+        }
+        return response;
+    }
+	
 
 	public Object queryListForMiniApps(VoucherQueryDto query) {
         PagedResponseBean<VoucherItemDTO> pagedResponseBean = new PagedResponseBean<VoucherItemDTO>(0, new ArrayList<VoucherItemDTO>());

src/main/java/com/ctrip/fun/golf/service/user/UserMService.java

@@ -232,16 +232,15 @@ public class UserMService extends BaseService {
     }
     
     
-    public MiniAppLoginResultBean loginMiniApp(WeChatAppLoginReq req) {
+    public Response<MiniAppLoginResultBean> loginMiniApp(WeChatAppLoginReq req) {
         Request<WeChatAppLoginReq> request = new Request<WeChatAppLoginReq>("", req);
         HttpEntity<Request<WeChatAppLoginReq>> entity = new HttpEntity<Request<WeChatAppLoginReq>>(request);
-        MiniAppLoginResultBean responseBean = null;
         Response<MiniAppLoginResultBean> response = super.exchange(
                 this.getServiceUri("uri.user.loginMiniApp"), HttpMethod.POST, entity,
                 new ParameterizedTypeReference<Response<MiniAppLoginResultBean>>() {
                 }).getBody();
         if (response.getStatus() == 0) {
-            responseBean = response.getBody();
+            return response;
         } else {
             logger.error("[list] status:{}, msg: {}", response.getStatus(), response.getMessage());
             if (response.getStatus() == -1) {
@@ -251,19 +250,18 @@ public class UserMService extends BaseService {
             }
 
         }
-        return responseBean;
     }
     
-    public MiniAppLoginResultBean miniAppLoginByDynamicPassword(MiniAppLoginBean req) {
-        Request<MiniAppLoginBean> request = new Request<MiniAppLoginBean>("", req);
-        HttpEntity<Request<MiniAppLoginBean>> entity = new HttpEntity<Request<MiniAppLoginBean>>(request);
-        MiniAppLoginResultBean responseBean = null;
+    public Response<MiniAppLoginResultBean> miniAppLoginByDynamicPassword(WeChatAppLoginReq req) {
+        Request<WeChatAppLoginReq> request = new Request<WeChatAppLoginReq>("", req);
+        HttpEntity<Request<WeChatAppLoginReq>> entity = new HttpEntity<Request<WeChatAppLoginReq>>(request);
+
         Response<MiniAppLoginResultBean> response = super.exchange(
                 this.getServiceUri("uri.user.miniAppLoginByDynamicPassword"), HttpMethod.POST, entity,
                 new ParameterizedTypeReference<Response<MiniAppLoginResultBean>>() {
                 }).getBody();
         if (response.getStatus() == 0) {
-            responseBean = response.getBody();
+        	 return response;
         } else {
             logger.error("[list] status:{}, msg: {}", response.getStatus(), response.getMessage());
             if (response.getStatus() == -1) {
@@ -273,7 +271,6 @@ public class UserMService extends BaseService {
             }
 
         }
-        return responseBean;
     }
     
     

src/main/resources/rpc.properties

@@ -99,6 +99,7 @@ uri.EntityImage.upload=/fun-golf-service/entityImage/upload
 uri.district.GetDistrictWeatherForecast=/fun-golf-service/district/weatherForecast
 
 uri.voucher.voucherSearch=/fun-golf-service/Voucher/QueryVoucherList
+uri.voucher.sendVoucherForMiniAppRegister=/fun-golf-service/Voucher/sendVoucherForMiniAppRegister
 uri.voucher.queryListForMiniApps=/fun-golf-service/Voucher/queryListForMiniApps
 uri.voucher.shareVoucherForMiniApps=/fun-golf-service/Voucher/shareVoucherForMiniApps
 uri.voucher.getShareVoucherLogForMiniApps=/fun-golf-service/Voucher/getShareVoucherLogForMiniApps