Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop'

调整测试

See merge request !15

order-application-service/src/main/java/cn/freemud/controller/test/TestController.java

@@ -5,17 +5,23 @@ import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
 import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.service.thirdparty.WeChatClient;
+import cn.freemud.utils.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * All rights Reserved, Designed By www.freemud.com
@@ -30,7 +36,6 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
  */
 @Slf4j
-@RequestMapping("/order")
 @RestController
 @Validated
 public class TestController {
@@ -70,8 +75,8 @@ public class TestController {
         return platformBaseResponse;
     }
 
-    @GetMapping("/test/groupBuy")
-    public BaseResponse testOrderDelivery() {
+    @GetMapping("/testGroupBuy")
+    public BaseResponse groupBuy() {
         String partnerId = "1864";
         String appId = "wxb78fb7c6218cb52c";
         GetAuthorizerRequestDto getAuthorizerRequestDto = new GetAuthorizerRequestDto();
@@ -114,11 +119,67 @@ public class TestController {
 
         //String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
 
+        log.info("bean:{}", groupBuyRequest);
         String result = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
 
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setResult(result);
-        log.info("response:{}",JSONObject.toJSONString(baseResponse));
+        log.info("response:{}", JSONObject.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
+    @GetMapping("/testGroupBuy2")
+    public BaseResponse groupBuy2() throws InvocationTargetException, IllegalAccessException {
+        String partnerId = "1864";
+        String appId = "wxb78fb7c6218cb52c";
+        GetAuthorizerRequestDto getAuthorizerRequestDto = new GetAuthorizerRequestDto();
+        getAuthorizerRequestDto.setPartnerId(partnerId);
+        getAuthorizerRequestDto.setAuthorizerAppid(appId);
+        GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
+
+        String accessToken = getTokenResponseDto.getResult().getAccessToken();
+        log.info("token:{}", accessToken);
+
+        GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
+        groupBuyRequest.setOut_trade_no("88888888");
+        groupBuyRequest.setRecv_openid("oORZK5NUo7sDvuJwPwbehqq360Tw");
+        groupBuyRequest.setScene(1);
+
+        // pay_list
+        GroupBuyRequest.PayList payList = new GroupBuyRequest.PayList();
+        List<GroupBuyRequest.UserInfo> userInfoList = new ArrayList<>();
+
+        GroupBuyRequest.UserInfo userInfo1 = new GroupBuyRequest.UserInfo();
+        userInfo1.setOpenid("oORZK5A8hrejg0uBVSlkpv-KPgv4");
+        userInfo1.setAmount(1);
+        userInfoList.add(userInfo1);
+//        GroupBuyRequest.UserInfo userInfo2 = new GroupBuyRequest.UserInfo();
+//        userInfo2.setOpenid("ohvIM0VbQw41wCznsgYHu7W6W_bA");
+//        userInfo2.setAmount(2);
+//        userInfoList.add(userInfo2);
+//        GroupBuyRequest.UserInfo userInfo3 = new GroupBuyRequest.UserInfo();
+//        userInfo3.setOpenid("oORZK5MHMBm78PO302NdRyzIY5K0");
+//        userInfo3.setAmount(3);
+//        userInfoList.add(userInfo2);
+
+
+        payList.setUser_info(userInfoList);
+        groupBuyRequest.setPay_list(payList);
+
+        // desc
+        GroupBuyRequest.Desc desc = new GroupBuyRequest.Desc();
+        desc.setText_desc("非码商户 20201128");
+
+        String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
+
+        Map paramMap = new HashMap();
+        BeanUtils.populate(groupBuyRequest, paramMap);
+        log.info("bean:{}", groupBuyRequest);
+        log.info("map:{}", paramMap.toString());
+        String result = HttpUtil.sendPostRequest(requestUrl, paramMap, null);
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setResult(result);
+        log.info("response:{}", JSONObject.toJSONString(baseResponse));
         return baseResponse;
     }
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/WeChatClient.java

@@ -71,7 +71,7 @@ public interface WeChatClient {
     /**
      * 发起群收款
      */
-    @PostMapping(value = "wxa/business/groupBuy/createOrder?access_token={accessToken}",
+    @PostMapping(value = "wxa/business/groupBuy/createOrder?access_token=39_5B21AfHFgOKmBeoFsnN_2wO0FUV2wwf6VF7i74eD0B15yqfmNJOyAS1f4N9HIUeHZ26Jn_FgsdJyBXGH09sS1-ADS2dGRRTFJ1YYhwjHsgolD35V2m5QFF005G-5brre6gk9sWN6Z9Ih-_BBNFWgAEDYQH",
             produces = MediaType.APPLICATION_JSON_VALUE,
             consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     String groupBuyCreateOrder(@PathVariable("accessToken") String accessToken, @RequestBody GroupBuyRequest groupBuyRequest);