提交测试

fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -10,6 +10,7 @@ import com.fs.common.config.FSSysConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.file.OssException;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.company.service.ICompanyService;
@@ -21,6 +22,8 @@ import com.fs.erp.service.IErpGoodsService;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.service.IErpShopService;
 import com.fs.erp.service.IErpUserService;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.utils.CrossServiceRsaUtil;
 import com.fs.pay.pay.domain.OrderResult;
 import com.fs.pay.pay.dto.OrderQueryDTO;
 import com.fs.pay.pay.service.PayService;
@@ -140,6 +143,37 @@ public class CommonController extends AppBaseController {
 //		return R.ok();
 //
 //	}
+	@ApiOperation("支付手动通知")
+	@GetMapping("/testaaa")
+	public R getPhoneByHttp(@RequestParam Integer addressId) {
+		try {
+//			String encryptedStr = CrossServiceRsaUtil.encryptForRequest("phone");
+//			String url = "http://42.194.245.189:8010/app/common/getEncryptedPhone";
+//			org.springframework.web.client.RestTemplate restTemplate = new org.springframework.web.client.RestTemplate();
+//			java.util.Map<String, Object> paramMap = new java.util.HashMap<>();
+//			paramMap.put("encryptedStr", encryptedStr);
+//			paramMap.put("addressId", addressId);
+//			org.springframework.http.HttpHeaders headers = new org.springframework.http.HttpHeaders();
+//			headers.setContentType(org.springframework.http.MediaType.APPLICATION_JSON);
+//			org.springframework.http.HttpEntity<java.util.Map<String, Object>> requestEntity = new org.springframework.http.HttpEntity<>(paramMap, headers);
+//			String responseBody = restTemplate.postForObject(url, requestEntity, String.class);
+//			if (StringUtils.isNotEmpty(responseBody)) {
+//				com.alibaba.fastjson.JSONObject respObj = com.alibaba.fastjson.JSON.parseObject(responseBody);
+//				if (respObj != null && "200".equals(respObj.getString("code"))) {
+//					String encryptedPhone = respObj.getString("data");
+//					if (StringUtils.isNotEmpty(encryptedPhone)) {
+//						String realPhone = CrossServiceRsaUtil.decryptResponse(encryptedPhone);
+//						if (StringUtils.isNotEmpty(realPhone)) {
+//							return R.ok().put("data", realPhone);
+//						}
+//					}
+//				}
+//			}
+		} catch (Exception ex) {
+
+		}
+		return R.ok();
+	}
 	@ApiOperation("支付手动通知")
 	@GetMapping("payNotify")
 	public R payNotify(String payCode) throws Exception