|
@@ -11,6 +11,7 @@ import com.yami.shop.bean.dto.hb.StoreRegister;
|
|
|
import com.yami.shop.bean.model.RefundAddr;
|
|
import com.yami.shop.bean.model.RefundAddr;
|
|
|
import com.yami.shop.bean.model.ShopDetail;
|
|
import com.yami.shop.bean.model.ShopDetail;
|
|
|
import com.yami.shop.bean.model.Transport2;
|
|
import com.yami.shop.bean.model.Transport2;
|
|
|
|
|
+import com.yami.shop.common.util.HttpUtil;
|
|
|
import com.yami.shop.common.util.PageParam;
|
|
import com.yami.shop.common.util.PageParam;
|
|
|
import com.yami.shop.common.util.R;
|
|
import com.yami.shop.common.util.R;
|
|
|
import com.yami.shop.common.util.hb.HBR;
|
|
import com.yami.shop.common.util.hb.HBR;
|
|
@@ -21,6 +22,7 @@ import com.yami.shop.service.hb.IStoreManagementService;
|
|
|
import com.yami.shop.utils.HBSignUtil;
|
|
import com.yami.shop.utils.HBSignUtil;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
+import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
@@ -48,6 +50,14 @@ public class StoreManagementService implements IStoreManagementService {
|
|
|
private final HBTransport2Mapper transport2Mapper;
|
|
private final HBTransport2Mapper transport2Mapper;
|
|
|
private final RefundAddrService refundAddrService;
|
|
private final RefundAddrService refundAddrService;
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 市民请集合门店修改和新增调用
|
|
|
|
|
+ */
|
|
|
|
|
+ private static String smqjhMdUrlAddAndUpdate="http://192.168.1.242:8080/smqjh-pms/api/v1/shopDetail/save";
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 市民请集合门店状态修改调用
|
|
|
|
|
+ */
|
|
|
|
|
+ private static String smqjhMdUrlUpdateStatus="http://192.168.1.242:8080/smqjh-pms/api/v1/shopDetail/save";
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 获取海博门店基础信息
|
|
* 获取海博门店基础信息
|
|
@@ -214,8 +224,20 @@ public class StoreManagementService implements IStoreManagementService {
|
|
|
refundAddr.setUpdateTime(new Date());
|
|
refundAddr.setUpdateTime(new Date());
|
|
|
refundAddrService.save(refundAddr);
|
|
refundAddrService.save(refundAddr);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+// String post =null;
|
|
|
|
|
+// try {
|
|
|
|
|
+// post = HttpUtil.post(smqjhMdUrlAddAndUpdate, registerRequest);
|
|
|
|
|
+// JSONObject jsonObject = JSONObject.parseObject(post);
|
|
|
|
|
+// Object code = jsonObject.get("code");
|
|
|
|
|
+// if (!ObjectUtils.isEmpty(code)&&"00000".equals(code.toString())){
|
|
|
|
|
+// log.info("市民请集合推送门店成功");
|
|
|
|
|
+// }else {
|
|
|
|
|
+// log.error("市民请集合推送门店失败返回"+post);
|
|
|
|
|
+// }
|
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
|
+// log.error("市民请集合推送门店失败异常"+e.getMessage());
|
|
|
|
|
+// log.error("市民请集合推送门店失败1"+post);
|
|
|
|
|
+// }
|
|
|
return HBR.success();
|
|
return HBR.success();
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("门店变更失败:{}", e.getMessage(), e);
|
|
log.error("门店变更失败:{}", e.getMessage(), e);
|
|
@@ -279,6 +301,20 @@ public class StoreManagementService implements IStoreManagementService {
|
|
|
}else {
|
|
}else {
|
|
|
log.error("不存在门店{}", stationId);
|
|
log.error("不存在门店{}", stationId);
|
|
|
}
|
|
}
|
|
|
|
|
+// String post =null;
|
|
|
|
|
+// try {
|
|
|
|
|
+// post = HttpUtil.post(smqjhMdUrlUpdateStatus, HBRequest);
|
|
|
|
|
+// JSONObject jsonObject = JSONObject.parseObject(post);
|
|
|
|
|
+// Object code = jsonObject.get("code");
|
|
|
|
|
+// if (!ObjectUtils.isEmpty(code)&&"00000".equals(code.toString())){
|
|
|
|
|
+// log.info("市民请集合推送门店成功");
|
|
|
|
|
+// }else {
|
|
|
|
|
+// log.error("市民请集合推送门店失败返回"+post);
|
|
|
|
|
+// }
|
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
|
+// log.error("市民请集合推送门店失败异常"+e.getMessage());
|
|
|
|
|
+// log.error("市民请集合推送门店失败1"+post);
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|