Commit 288b8d24 by dingkai

微商城对接生态

parent 084291d1
......@@ -18,14 +18,15 @@ import lombok.Data;
@Data
public class GetTokenResponseDto {
private String statusCode;
private String msg;
private String code;
private String message;
private String subMsg;
private String ver;
private ResultBean data;
private ResultBean result;
@Data
public static class ResultBean {
private String appid;
private String miniAppId;
private String accessToken;
}
......
......@@ -123,8 +123,6 @@ public class MallOrderServiceImpl implements MallOrderService {
@Autowired
private OrderSdkService orderSdkService;
@Autowired
private WechatApplicationServiceClient wechatApplicationServiceClient;
@Autowired
private EcologyAdminApplicationClient ecologyAdminApplicationClient;
/**
......@@ -655,12 +653,12 @@ public class MallOrderServiceImpl implements MallOrderService {
GetAuthorizerRequestDto getAuthorizerRequestDto = new GetAuthorizerRequestDto();
getAuthorizerRequestDto.setPartnerId(orderBean.getCompanyId());
getAuthorizerRequestDto.setAuthorizerAppid(orderExtInfoDto.getAppid());
GetTokenResponseDto getTokenResponseDto = wechatApplicationServiceClient.getToken(getAuthorizerRequestDto);
if(getTokenResponseDto == null || getTokenResponseDto.getData() == null) {
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
if(getTokenResponseDto == null || getTokenResponseDto.getResult() == null || StringUtils.isBlank(getTokenResponseDto.getResult().getAccessToken())) {
LogUtil.info(trackingNo, "createDelivery getToken fail", gson.toJson(getAuthorizerRequestDto), gson.toJson(getTokenResponseDto));
return false;
}
String accessToken = getTokenResponseDto.getData().getAccessToken();
String accessToken = getTokenResponseDto.getResult().getAccessToken();
CreateDeliveryOrderRequestDto createDeliveryOrderRequestDto = deliveryAdapter.convertToWeixinDeliveryOrderRequestDto(orderBean, storeResponse, accessToken, deliveryNotifyUrl);
CreateDeliveryOrderResponseDto createDeliveryOrderResponseDto = deliveryService.deliveryOrderAdd(createDeliveryOrderRequestDto, trackingNo);
/**
......
......@@ -3,6 +3,8 @@ package cn.freemud.service.thirdparty;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -22,4 +24,8 @@ public interface EcologyAdminApplicationClient {
*/
@PostMapping(value = "ecology/api/app/info/getBuyBindVirtualStore", produces = MediaType.APPLICATION_JSON_VALUE ,consumes = MediaType.APPLICATION_JSON_VALUE )
BaseResponse<VirtualBindStoreResponse> getBuyBindVirtualStore(@RequestBody VirtualStoreRequest virtualStoreRequest);
@PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
}
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