|
@@ -67,6 +67,7 @@ public class AppUserInfoController {
|
|
|
Map<String, String> map = stationService.getStationAppIdAndAppSecret(stationId);
|
|
|
appId = map.get("appId"); //微信小程序appID
|
|
|
appSecret = map.get("appSecret"); //微信小程序密钥
|
|
|
+ logger.info("油站信息:"+map.toString());
|
|
|
}
|
|
|
//获取session_key 和 openid
|
|
|
return WeiXinUserUtil.getUserSessionKeyAndOpenID(appId, appSecret, code);
|
|
@@ -127,7 +128,7 @@ public class AppUserInfoController {
|
|
|
logger.info("签名参数拼接:"+ string1);
|
|
|
//sha1加密
|
|
|
String signature = DigestUtils.sha1Hex(string1);
|
|
|
- //String signature = this.sha1(string1);
|
|
|
+ logger.info("JS-SDK签名参数sha1加密后:"+ signature);
|
|
|
resultData = ResultData.success(signature);
|
|
|
}
|
|
|
return gson.toJson(resultData);
|
|
@@ -480,6 +481,7 @@ public class AppUserInfoController {
|
|
|
//当前时间戳
|
|
|
String currentTime = String.valueOf(System.currentTimeMillis());
|
|
|
String customerNo = request.getStationId() + currentTime;
|
|
|
+ customerElectronicCard.setStationName(request.getStationName());
|
|
|
customerElectronicCard.setCustomerNo(customerNo);
|
|
|
customerElectronicCard.setAmt(new BigDecimal(0));
|
|
|
customerElectronicCard.setCardOilsType("1");
|