Skip to content

O
order-group
Commit 8739e74e by 缪晖
Options

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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/test/TestController.java
parents 0ba4cae8 be105679
Showing with 6 additions and 65 deletions
order-application-service/src/main/java/cn/freemud/controller/test/TestController.java
......@@ -56,11 +56,6 @@ public class TestController {
@ApiAnnotation(logMessage = "refundStatusChange")
@PostMapping("/refundStatusChange")
public PlatformBaseResponse refundStatusChange(@Validated @LogParams @RequestBody PlatformBaseRequest checkBeforeCreateOrderRequestVo) {
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
PlatformBaseResponse platformBaseResponse = new PlatformBaseResponse();
platformBaseResponse.setStatusCode("100");
return platformBaseResponse;
......@@ -116,70 +111,16 @@ public class TestController {
// desc
GroupBuyRequest.Desc desc = new GroupBuyRequest.Desc();
desc.setText_desc("非码商户 20201128");
groupBuyRequest.setDesc(desc);
//String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
log.info("bean:{}", groupBuyRequest);
String result = weChatClient.groupBuyCreateOrder(groupBuyRequest);
String result = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
BaseResponse baseResponse = new BaseResponse();
baseResponse.setResult(result);
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,9 +71,9 @@ public interface WeChatClient {
/**
* 发起群收款
*/
@PostMapping(value = "wxa/business/groupBuy/createOrder?access_token=39_5B21AfHFgOKmBeoFsnN_2wO0FUV2wwf6VF7i74eD0B15yqfmNJOyAS1f4N9HIUeHZ26Jn_FgsdJyBXGH09sS1-ADS2dGRRTFJ1YYhwjHsgolD35V2m5QFF005G-5brre6gk9sWN6Z9Ih-_BBNFWgAEDYQH",
@PostMapping(value = "wxa/business/groupBuy/createOrder?access_token={accessToken}",
produces = MediaType.APPLICATION_JSON_VALUE,
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
String groupBuyCreateOrder(@RequestBody GroupBuyRequest groupBuyRequest);
String groupBuyCreateOrder(@PathVariable("accessToken") String accessToken, @RequestBody GroupBuyRequest groupBuyRequest);
}
order-application-service/src/test/java/cn.freemud/client/EcologyAdminApplicationClientTest.java
......@@ -97,7 +97,7 @@ public class EcologyAdminApplicationClientTest {
//String requestUrl = "https://api.weixin.qq.com/wxa/business/groupBuy/createOrder?access_token=" + accessToken;
// String result = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
// log.info(result);
String result = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
log.info(result);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment