|
|
@@ -14,7 +14,6 @@ import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.input.SettleNoteStatusOutput;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleInput;
|
|
|
-import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
|
|
|
@@ -495,7 +494,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
try {
|
|
|
|
|
|
// 获取请求token
|
|
|
- ResponseEntity<String> tokenResult = restTemplate.getForEntity(String.format(GIG_TOKEN_URL, upmsConfig.getGigServiceUrl()), String.class,
|
|
|
+ String url = String.format(GIG_TOKEN_URL, upmsConfig.getGigServiceUrl());
|
|
|
+ log.info("远端请求gig-token：{}", url);
|
|
|
+ ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(url, String.class,
|
|
|
String.valueOf(operator.getDeptId()), "settle", String.valueOf(operator.getId()));
|
|
|
log.warn("获取结算token：{}", tokenResult.getBody());
|
|
|
if (!JSONUtil.isJson(tokenResult.getBody())) {
|
|
|
@@ -551,9 +552,11 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
}
|
|
|
|
|
|
// 发起结算
|
|
|
+ String url1 = String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl());
|
|
|
+ log.info("远端请求gig-settle：{}", url);
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
headers.setContentType(MediaType.APPLICATION_JSON);
|
|
|
- HttpEntity<String> result = restTemplate.exchange(String.format(GIG_SETTLE_URL, upmsConfig.getGigServiceUrl()), HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
|
|
|
+ HttpEntity<String> result = new RestTemplate().exchange(url1, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
|
|
|
log.warn("阿拉丁结算： {}", result.getBody());
|
|
|
if (!JSONUtil.isJson(result.getBody())) {
|
|
|
return R.failed("结算失败");
|
