Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 a04cc61a75c61025a4efcdd95b07d73b0f892ce9

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kuaidi100.sdk.contant.CompanyConstant;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
@@ -79,7 +80,6 @@
      if(null != afterSaleTime && LocalDateTime.now().isAfter(afterSaleTime)){
         return R.fail("已超过售后期间");
      }
		
      //构建售后申请数据
      RefundPass refundPass = new RefundPass();
      refundPass.setOrderId(applyRefundPass.getId());
@@ -132,8 +132,10 @@
      List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
      for (OrderRefundPassList refundPassList : orderRefundPassList) {
         AppUser appUser = appUserClient.getAppUserById(refundPassList.getAppUserId());
         refundPassList.setUserName(appUser.getName());
         refundPassList.setPhone(appUser.getPhone());
         if(null != appUser){
            refundPassList.setUserName(appUser.getName());
            refundPassList.setPhone(appUser.getPhone());
         }
      }
      return pageInfo.setRecords(orderRefundPassList);
   }
@@ -153,12 +155,16 @@
         return R.fail("不能重复操作");
      }
      refundPass.setPassStatus(status);
      refundPass.setAuthTime(LocalDateTime.now());
      //退货退款
      if(refundPass.getRefundMethod() == 1 && 2 == status){
         refundPass.setStatus(4);
      }
      if(refundPass.getRefundMethod() == 2 && 2 == status){
         refundPass.setStatus(2);
      }
      if(3 == status){
         refundPass.setStatus(3);
      }
      refundPass.setPassRemark(passRemark);
      //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
@@ -227,6 +233,14 @@
      refundPassInfo.setPics(refundPass.getPics());
      refundPassInfo.setPassStatus(refundPass.getPassStatus());
      refundPassInfo.setPassRemark(refundPass.getPassRemark());
      refundPassInfo.setStatus(refundPass.getStatus());
      String code = refundPass.getCode();
      if(StringUtils.isNotEmpty(code)){
         JSONObject jsonObject = JSON.parseObject(code);
         refundPassInfo.setExpressCode(jsonObject.getString("num"));
         String com = jsonObject.getString("com");
         refundPassInfo.setExpressName(com);
      }
      return refundPassInfo;
   }
}