|
|
@@ -27,8 +27,10 @@ import com.yami.shop.bean.pay.RefundInfoDto;
|
|
|
import com.yami.shop.bean.vo.ExportContext;
|
|
|
import com.yami.shop.bean.vo.OrderRefundSkuVo;
|
|
|
import com.yami.shop.bean.vo.OrderRefundVo;
|
|
|
+import com.yami.shop.common.bean.smqjh.Result;
|
|
|
import com.yami.shop.common.config.Constant;
|
|
|
import com.yami.shop.common.enums.PayType;
|
|
|
+import com.yami.shop.common.enums.SMQJHResultCode;
|
|
|
import com.yami.shop.common.exception.GlobalException;
|
|
|
import com.yami.shop.common.exception.YamiShopBindException;
|
|
|
import com.yami.shop.common.util.Arith;
|
|
|
@@ -45,6 +47,7 @@ import com.yami.shop.utils.SmqjhUtil;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import ma.glasnost.orika.MapperFacade;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.CellStyle;
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
|
@@ -1107,8 +1110,22 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
|
|
|
changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
|
|
|
if (ChannelType.SMQJH.value().equals(orderRefund.getChannelType())){
|
|
|
//当属于市民请集合的订单的时候,直接回推市民请集合进行退款逻辑处理;
|
|
|
- HttpUtil.get(smqjhUtil.getOmsBaseUrl()+SmqjhUtil.omsSmqjhRefundPointsHandleUrl+orderRefund.getRefundSn());
|
|
|
-
|
|
|
+ log.info("【详情】推送市民请集合积分处理:,{}",orderRefund.getRefundSn());
|
|
|
+ try {
|
|
|
+ String s = HttpUtil.get(smqjhUtil.getOmsBaseUrl() + SmqjhUtil.omsSmqjhRefundPointsHandleUrl + orderRefund.getRefundSn());
|
|
|
+ log.info("【详情】推送市民请集合积分处理返回:,{}",s);
|
|
|
+ if (StringUtils.isNotEmpty(s)){
|
|
|
+ Result result = JSONObject.parseObject(s, Result.class);
|
|
|
+ if (result==null){
|
|
|
+ log.error("【详情】推送市民请集合积分处理返回失败1:");
|
|
|
+ }
|
|
|
+ if (!SMQJHResultCode.SUCCESS.getCode().equals(result.getCode())){
|
|
|
+ log.error("【详情】推送市民请集合积分处理返回失败2:"+result.getMsg());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("【详情】推送市民请集合积分报错:"+e.getMessage()+"{}",e);
|
|
|
+ }
|
|
|
}else {
|
|
|
orderService.returnRefund(orderRefund.getOrderNumber());
|
|
|
}
|