|
|
@@ -2,44 +2,21 @@ package com.yami.shop.service.xsb.impl;
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.yami.shop.bean.dto.OrderRefundDto;
|
|
|
-import com.yami.shop.bean.enums.*;
|
|
|
-import com.yami.shop.bean.model.*;
|
|
|
-import com.yami.shop.bean.vo.xsb.OmsOrderRefundSkuVo;
|
|
|
+import com.yami.shop.bean.enums.ChannelType;
|
|
|
+import com.yami.shop.bean.model.OrderRefund;
|
|
|
import com.yami.shop.bean.vo.xsb.RefundOrderPushStatusVo;
|
|
|
-import com.yami.shop.bean.vo.xsb.RefundOrderPushVo;
|
|
|
-import com.yami.shop.common.bean.smqjh.OrderRefundCancelVo;
|
|
|
-import com.yami.shop.common.bean.smqjh.OrderRefundExpressParamVo;
|
|
|
import com.yami.shop.common.bean.smqjh.Result;
|
|
|
-import com.yami.shop.common.config.Constant;
|
|
|
import com.yami.shop.common.enums.SMQJHResultCode;
|
|
|
-import com.yami.shop.common.exception.GlobalException;
|
|
|
-import com.yami.shop.common.util.Arith;
|
|
|
import com.yami.shop.common.util.HttpUtil;
|
|
|
import com.yami.shop.common.util.R;
|
|
|
-import com.yami.shop.common.util.RefundSnUtils;
|
|
|
-import com.yami.shop.dao.*;
|
|
|
-import com.yami.shop.service.OrderRefundService;
|
|
|
-import com.yami.shop.service.OrderService;
|
|
|
+import com.yami.shop.dao.PointsRecordMapper;
|
|
|
import com.yami.shop.service.xsb.XSBPushRefundOrderService;
|
|
|
-import com.yami.shop.utils.CullenUtils;
|
|
|
import com.yami.shop.utils.SmqjhUtil;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.math.RoundingMode;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
@Slf4j
|
|
|
@Service
|
|
|
@@ -71,6 +48,7 @@ public class XSBPushRefundOrderServiceImpl implements XSBPushRefundOrderService
|
|
|
refundOrderPushStatusVo.setApplyType(orderRefund.getApplyType());
|
|
|
log.info("推送市民请集合状态推送请求参数,{}", com.alibaba.fastjson2.JSONObject.toJSONString(refundOrderPushStatusVo));
|
|
|
String post = HttpUtil.post(smqjhUtil.getOmsBaseUrl()+SmqjhUtil.omsSmqjhRefundUrlUpdateStatus, refundOrderPushStatusVo);
|
|
|
+ log.info("推送市民请集合状态推送返回参数,{}", post);
|
|
|
if (StringUtils.isNotEmpty(post)){
|
|
|
Result result = JSONObject.parseObject(post, Result.class);
|
|
|
if (result==null){
|
