|
@@ -18,6 +18,8 @@ import com.xiaoju.open.oil.interfaces.request.*;
|
|
|
import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniCancelOrderStatusRequest;
|
|
|
import com.xiaoju.open.oil.interfaces.response.*;
|
|
|
import com.xiaoju.open.oil.security.secret.SecurityService;
|
|
|
+import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
|
|
|
+import com.zswl.cloud.shop.client.service.ShopService;
|
|
|
import com.zswl.cloud.springBatch.client.model.request.*;
|
|
|
import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;
|
|
|
import com.zswl.cloud.springBtach.server.core.dao.XiaoJuOrderDao;
|
|
@@ -56,15 +58,17 @@ public class XiaoJuService {
|
|
|
@Autowired
|
|
|
ApiLogDao apiLogDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ShopService shopService;
|
|
|
+
|
|
|
// 查询加油站详情
|
|
|
public ResponseDTO notificationPushStoreInfoRequest(OilRequest oilRequest) {
|
|
|
|
|
|
+ TripartiteShopDto tripartiteShopDto = new TripartiteShopDto();
|
|
|
|
|
|
log.info("原始请求:{}", JSONUtil.toJsonStr(oilRequest));
|
|
|
-
|
|
|
String s = SecurityService.genDecodeData(oilRequest.getData(), oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
|
|
|
-
|
|
|
ApiLog apiLog = new ApiLog();
|
|
|
apiLog.setService("notificationPushStoreInfoRequest");
|
|
|
apiLog.setRequest(s);
|
|
@@ -72,6 +76,23 @@ public class XiaoJuService {
|
|
|
|
|
|
|
|
|
XiaoJuStore xiaoJuStore = JSONUtil.toBean(s, XiaoJuStore.class);
|
|
|
+ tripartiteShopDto.setKey("加油");
|
|
|
+ tripartiteShopDto.setTripartiteId(xiaoJuStore.getStoreId());
|
|
|
+ tripartiteShopDto.setShopName(xiaoJuStore.getStoreName());
|
|
|
+ tripartiteShopDto.setProvince(xiaoJuStore.getProvinceName());
|
|
|
+ tripartiteShopDto.setCity(xiaoJuStore.getCityName());
|
|
|
+ tripartiteShopDto.setAddress(xiaoJuStore.getAddress());
|
|
|
+ tripartiteShopDto.setMapLon(String.valueOf(xiaoJuStore.getLon()));
|
|
|
+ tripartiteShopDto.setMapLat(String.valueOf(xiaoJuStore.getLat()));
|
|
|
+ tripartiteShopDto.setLogoPath(xiaoJuStore.getLogo());
|
|
|
+ tripartiteShopDto.setDetailImg(xiaoJuStore.getPicList().get(0));
|
|
|
+
|
|
|
+
|
|
|
+ com.zswl.cloud.shop.client.ret.ResultContent resultContent = shopService.tripartiteShop(tripartiteShopDto);
|
|
|
+ log.info("创建店铺响应{}", JSONUtil.toJsonStr(resultContent));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(xiaoJuStore.getStoreId());
|
|
|
if (byStoreId != null) {
|
|
@@ -83,7 +104,6 @@ public class XiaoJuService {
|
|
|
xiaoJuStoreDao.save(xiaoJuStore);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
|
|
|
String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
|
|
|
ResponseDTO responseDTO = new ResponseDTO();
|