配送售后退货退款海博库存没加回去处理

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

@@ -3,6 +3,7 @@ package com.yami.shop.api.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yami.shop.bean.enums.ReturnMoneyStsType;
 import com.yami.shop.bean.model.*;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
@@ -15,6 +16,7 @@ import com.yami.shop.service.RefundDeliveryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +30,7 @@ import java.util.Date;
 @RestController
 @RequestMapping("/refund/delivery")
 @Api(tags = "退货物流信息接口")
+@Slf4j
 @AllArgsConstructor
 public class RefundDeliveryController {
 
@@ -76,7 +79,7 @@ public class RefundDeliveryController {
     @PostMapping("/save")
     @ApiOperation("保存退货物流信息")
     @Transactional(rollbackFor = Exception.class)
-    public R<?> save(@Valid @RequestBody RefundDelivery refundDelivery) {
+    public synchronized R<?> save(@Valid @RequestBody RefundDelivery refundDelivery) {
 
 
         //获取门店信息
@@ -99,6 +102,13 @@ public class RefundDeliveryController {
             throw new GlobalException("该退款单不存在");
         }
 
+        if (orderRefund.getReturnMoneySts() == null || orderRefund.getReturnMoneySts() == 60) {
+            throw new GlobalException("该退款单状态不对不能提交");
+        }
+
+        orderRefund.setReturnMoneySts(ReturnMoneyStsType.RECEIVE.value());
+        orderRefund.setShipTime(new Date());
+        orderRefund.setUpdateTime(new Date());
         orderRefund.setIsReturnLogistics(true);
         orderRefundService.updateById(orderRefund);
 
@@ -111,6 +121,10 @@ public class RefundDeliveryController {
         orderRefundRecord.setAuditStatus(7);
         orderRefundRecord.setSort(5);
         orderRefundRecordMapper.insert(orderRefundRecord);
+
+        log.info("客户填写完成快递信息后海博退款单状态同步65");
+        orderRefundService.changeStatus(orderRefund.getRefundSn(), ReturnMoneyStsType.RECEIVE.value());
+
         return R.SUCCESS("添加成功");
     }
 

yami-shop-api/src/main/resources/redisson/redisson-dev.yml

@@ -1,8 +1,8 @@
 # 单节点设置
 singleServerConfig:
-  address: redis://192.168.1.242:6379
-  database: 1
-  password: FaajjVy8rl(k
+  address: redis://47.109.23.229:6379
+  database: 5
+  password: zswladmin
   idleConnectionTimeout: 10000
   pingTimeout: 1000
   connectTimeout: 10000

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

@@ -208,6 +208,8 @@ public class Product implements Serializable {
     @TableField(exist = false)
     private String shopName;
 
+
+    //已售货数量
     @TableField(exist = false)
     private Integer salesVolume;
 

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1099,7 +1099,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                     applyDeal = 1;
                 }
             }
-            Date date = new Date();
+//            Date date = new Date();
             OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
             if (auditType == 3) {
                 //3：驳回
@@ -1118,7 +1118,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 //审核通过
                 orderRefund.setApplyType(applyDeal);
                 if (applyDeal == 1) {
-
                     orderRefund.setReturnMoneySts(ReturnMoneyStsType.SUCCESS.value());
                 } else {
                     //退货退款需要处理二审
@@ -1128,11 +1127,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
 
                 //生成待商家审核记录
                 if (applyDeal == 1) {
-                    addOrderRefundRecord(orderRefund.getRefundId(), 3, 3, "你的申请已通过，退款处理中");
+                    addOrderRefundRecord(orderRefund.getRefundId(), 5, 3, "你的申请已通过，退款处理中");
                 } else {
-                    addOrderRefundRecord(orderRefund.getRefundId(), 5, 3, "申请已通过，请及时填写配送信息并支付配送费");
+                    addOrderRefundRecord(orderRefund.getRefundId(), 6, 3, "申请已通过，请及时填写配送信息");
                 }
-
             }
 
             if (applyDeal == 1) {
@@ -1182,7 +1180,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             //推送商家审核状态后 同步退款单状态
             changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
             //生成待商家审核记录
-            addOrderRefundRecord(orderRefund.getRefundId(), 7, 5, "商家收到商品井确认不影响二次销售后，将会为您处理退款");
+//            addOrderRefundRecord(orderRefund.getRefundId(), 7, 5, "商家收到商品井确认不影响二次销售后，将会为您处理退款");
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
             HBR.error("未知异常");

yami-shop-service/src/main/resources/mapper/OrderRefundMapper.xml

@@ -518,7 +518,7 @@
         where refund.refund_id = #{refundId}
     </select>
     <select id="findByOrderNumber" resultType="com.yami.shop.bean.model.OrderRefund">
-        select * from tz_order_refund where return_money_sts=#{returnMoneySts} and order_number =#{orderNumber} and handler =0
+        select * from tz_order_refund where return_money_sts=#{returnMoneySts} and order_number =#{orderNumber}
     </select>
 
 </mapper>