退货快递信息处理

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -19,6 +19,7 @@ import com.yami.shop.common.config.Constant;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.Arith;
 import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.dao.OrderRefundRecordMapper;
 import com.yami.shop.dao.OrderRefundSkuMapper;
 import com.yami.shop.delivery.comment.api.paotui.PaoTuiApi;
@@ -670,7 +671,7 @@ public class OrderRefundController {
      */
     @GetMapping("/info")
     @ApiOperation(value = "查看退款订单详情", notes = "查看退款订单详情")
-    public ResponseEntity<ApiOrderRefundDto> info(String refundSn) {
+    public R<ApiOrderRefundDto> info(String refundSn) {
         // 查询详情
         OrderRefundDto orderRefundDto = orderRefundService.getOrderRefundByRefundSn(refundSn);
 
@@ -680,11 +681,7 @@ public class OrderRefundController {
 
         ApiOrderRefundDto apiOrderRefundDto = mapperFacade.map(orderRefundDto, ApiOrderRefundDto.class);
 
-        //收货地址对象
-        orderRefundDto.setRefundDelivery(refundDeliveryService.getOne(
-                new LambdaQueryWrapper<RefundDelivery>().eq(RefundDelivery::getRefundSn, orderRefundDto.getRefundSn())));
-
-        return ResponseEntity.ok(apiOrderRefundDto);
+        return R.SUCCESS(apiOrderRefundDto);
     }
 
     /**

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundDeliveryController.java

@@ -54,6 +54,9 @@ public class RefundDeliveryController {
     @ApiOperation("根据退款编号获取退货物流信息")
     public ResponseEntity<RefundDelivery> getByRefundSn(@PathVariable("refundSn") String refundSn) {
         RefundDelivery refundDelivery = refundDeliveryService.getOne(new LambdaQueryWrapper<RefundDelivery>().eq(RefundDelivery::getRefundSn, refundSn));
+        if (ObjectUtil.isEmpty(refundDelivery)){
+            return ResponseEntity.ok(new RefundDelivery());
+        }
         return ResponseEntity.ok(refundDelivery);
     }
 
@@ -89,13 +92,17 @@ public class RefundDeliveryController {
         refundDelivery.setReceiverTelephone(shopDetail.getMobile());
         refundDeliveryService.save(refundDelivery);
         //添加填写物流信息轨迹
-        OrderRefund one = orderRefundService.getOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, refundDelivery.getRefundSn()));
+        OrderRefund orderRefund = orderRefundService.getOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, refundDelivery.getRefundSn()));
 
-        if (ObjectUtil.isEmpty( one)){
+        if (ObjectUtil.isEmpty( orderRefund)){
             throw new GlobalException("该退款单不存在");
         }
+
+        orderRefund.setIsReturnLogistics(true);
+        orderRefundService.updateById( orderRefund);
+
         OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
-        orderRefundRecord.setOrderRefundId(one.getRefundId());
+        orderRefundRecord.setOrderRefundId(orderRefund.getRefundId());
         orderRefundRecord.setInstructions("商家收到商品井确认不影响二次销售后，将会为您处理退款");
         Date date = new Date();
         orderRefundRecord.setCreateTime(date);

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/RefundDeliveryDto.java

@@ -21,6 +21,9 @@ public class RefundDeliveryDto {
     @ApiModelProperty("物流公司id")
     private Long deyId;
 
+    @ApiModelProperty("门店id")
+    private Long shopId;
+
     @ApiModelProperty("物流公司名称")
     private String deyName;
 

yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java

@@ -84,6 +84,12 @@ public class OrderRefund implements Serializable{
      * 是否接收到商品(1:已收到,0:未收到)
      */
     private Boolean isReceiver;
+
+    /**
+     * 是否填写了退货物流信息(1:已填写,0:未填写)
+     */
+    private Boolean isReturnLogistics;
+
     /**
      * 申请原因
      */

yami-shop-security/yami-shop-security-api/src/main/java/com/yami/shop/security/api/config/ResourceServerConfiguration.java

@@ -48,7 +48,8 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                 .authorizeRequests()
                 .antMatchers(
                         "/p/delivery/getDeliveryList",
-                        "/p/order/orderNumber"
+                        "/p/order/orderNumber",
+                        "/p/orderRefund/**"
                         ).permitAll()
                 .and()