|
@@ -44,7 +44,7 @@ public class XiaoJuService {
|
|
|
OilConfig oilConfig;
|
|
|
|
|
|
// 查询加油站详情
|
|
|
- public ResponseDTO notificationPushStoreInfoRequest(OilRequest oilRequest){
|
|
|
+ public ResponseDTO notificationPushStoreInfoRequest(OilRequest oilRequest) {
|
|
|
|
|
|
log.info("加油站通知原始数据:{}", oilRequest);
|
|
|
|
|
@@ -54,14 +54,14 @@ public class XiaoJuService {
|
|
|
XiaoJuStore xiaoJuStore = JSONUtil.toBean(s, XiaoJuStore.class);
|
|
|
|
|
|
XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(xiaoJuStore.getStoreId());
|
|
|
- if(byStoreId != null){
|
|
|
- BeanUtils.copyProperties(oilRequest, byStoreId,"id","updateTime");
|
|
|
+ if (byStoreId != null) {
|
|
|
+ BeanUtils.copyProperties(oilRequest, byStoreId, "updateTime");
|
|
|
}
|
|
|
|
|
|
xiaoJuStoreDao.save(xiaoJuStore);
|
|
|
|
|
|
|
|
|
- String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
+ String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
|
|
|
ResponseDTO responseDTO = new ResponseDTO();
|
|
|
responseDTO.setAppKey(oilConfig.getAppId());
|
|
@@ -72,7 +72,8 @@ public class XiaoJuService {
|
|
|
return responseDTO;
|
|
|
|
|
|
}
|
|
|
- public ResponseDTO notifyOrderInfo(OilRequest oilRequest){
|
|
|
+
|
|
|
+ public ResponseDTO notifyOrderInfo(OilRequest oilRequest) {
|
|
|
|
|
|
|
|
|
String s = SecurityService.genDecodeData(oilRequest.getData(), oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
@@ -81,11 +82,7 @@ public class XiaoJuService {
|
|
|
NotificationReceiveRefundRequest xiaoJuStore = JSONUtil.toBean(s, NotificationReceiveRefundRequest.class);
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
+ String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
|
|
|
ResponseDTO responseDTO = new ResponseDTO();
|
|
|
responseDTO.setAppKey(oilConfig.getAppId());
|
|
@@ -113,6 +110,7 @@ public class XiaoJuService {
|
|
|
|
|
|
return ResultContent.buildContent(queryStoreDetailResponse);
|
|
|
}
|
|
|
+
|
|
|
public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(String storeId) {
|
|
|
QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
|
|
|
queryApiStorePriceRequest.setOpenChannel(1);
|
|
@@ -129,11 +127,4 @@ public class XiaoJuService {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|