Просмотр исходного кода

Merge branch 'release_toaliyun_real_202207' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202207

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
8f7b0ca917
2 измененных файлов: 5 добавлений и 3 удалений
  1. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java

+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -265,6 +265,7 @@ public class WxInfoController extends BaseController {


try { try {
// 解密 // 解密
buser.setSessionKey(session_key);
String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen); String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen);
if (null != phone) { if (null != phone) {
resultMap.put("phone", phone); resultMap.put("phone", phone);
@@ -332,6 +333,7 @@ public class WxInfoController extends BaseController {
CUser buser = cuserFactory.getBUserService(appPlat).getByOpenId(openId,wxAppinfo.getTenantId()); CUser buser = cuserFactory.getBUserService(appPlat).getByOpenId(openId,wxAppinfo.getTenantId());


try { try {
buser.setSessionKey(session_key);
String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen); String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen);
resultMap.put("msg", "授权手机成功!"); resultMap.put("msg", "授权手机成功!");
resultMap.put("phone", phone); resultMap.put("phone", phone);


+ 3
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -1069,7 +1069,7 @@ public class WxOrderController extends BaseController {
// return openId; // return openId;
// } // }
@AuthIgnore @AuthIgnore
@ApiOperation(value = "抖音支付2.0退款回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@ApiOperation(value = "抖音支付2.0退款回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@PostMapping("douyinRefundOrder") @PostMapping("douyinRefundOrder")
public Map<String,Object> douyinRefundOrder(HttpServletRequest request) { public Map<String,Object> douyinRefundOrder(HttpServletRequest request) {
SignatureHeader header = new SignatureHeader(); SignatureHeader header = new SignatureHeader();
@@ -1077,10 +1077,10 @@ public class WxOrderController extends BaseController {
header.setNonce(request.getHeader("Byte-Nonce-Str")); header.setNonce(request.getHeader("Byte-Nonce-Str"));
header.setSigned(request.getHeader("Byte-Signature")); header.setSigned(request.getHeader("Byte-Signature"));


logger.info("支付2.0预下单回调---header{}"+header.toString());
logger.info("抖音支付2.0退款回调---header{}"+header.toString());


String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); String body = ((BodyReaderHttpServletRequestWrapper) request).getBody();
logger.info("支付2.0预下单回调---body{}"+body);
logger.info("抖音支付2.0退款回调---body{}"+body);


Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
map.put("err_no",1001); map.put("err_no",1001);


Загрузка…
Отмена
Сохранить