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

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

@@ -123,11 +123,9 @@ public class MyOrderController {
     @ApiImplicitParam(name = "orderNumber", value = "订单号", required = true, dataType = "String")
     public ResponseEntity<OrderShopDto> orderDetail(@RequestParam(value = "orderNumber", required = true) String orderNumber) {
         String userId = SecurityUtils.getUser().getUserId();
-//        String userId = "36726893042d492aba446439c5f00584";
         OrderShopDto orderShopDto = new OrderShopDto();
 
         Order order = orderService.getOrderByOrderNumberAndUserId(orderNumber, userId, true);
-//        Order order = orderService.getOne(Wrappers.<Order>lambdaQuery().eq(Order::getOrderNumber, orderNumber));
         SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日$HH:mm");
         if (null != order.getPayTime()) {
             // 转换为 LocalDateTime 并增加 1 小时
@@ -158,18 +156,10 @@ public class MyOrderController {
 
         //计算订单使用积分
         Integer score = 0;
-//        for (OrderItem orderItem : orderItems) {
-//            score += orderItem.getUseScore();
-//        }
-//        if (score > 0) {
-//            score = (int) (score + order.getFreightAmount());
-//        }
-
         List<OrderItemDto> orderItemDtoList = mapperFacade.mapAsList(orderItems, OrderItemDto.class);
         //加上运费
         orderShopDto.setOrderScore(score);
         orderShopDto.setShopId(shopDetail.getShopId());
-//        orderShopDto.setShopId(0L);
         orderShopDto.setDvyType(order.getDvyType());
         orderShopDto.setShopName(shopDetail.getShopName());
         orderShopDto.setActualTotal(order.getActualTotal());
@@ -198,6 +188,7 @@ public class MyOrderController {
         orderShopDto.setFianllyTime(order.getFinallyTime());
         // 取消时间
         orderShopDto.setCancelTime(order.getCancelTime());
+        orderShopDto.setCancelReason(order.getCancelReason());
         // 更新时间
         orderShopDto.setUpdateTime(order.getUpdateTime());
 

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

@@ -220,9 +220,9 @@ public class OrderRefundController {
         newOrderRefund.setBuyerMobile(orderRefundParam.getBuyerMobile());
         newOrderRefund.setPhotoFiles(orderRefundParam.getPhotoFiles());
         newOrderRefund.setReturnMoneySts(ReturnMoneyStsType.APPLY.value());
+        newOrderRefund.setFreightAmount(orderRefundParam.getFreightAmount());
         newOrderRefund.setApplyTime(new Date());
         newOrderRefund.setUpdateTime(new Date());
-        newOrderRefund.setFreightAmount(orderRefundParam.getFreightAmount());
 
         long orderPoints = order.getOffsetPoints() == null ? 0 : order.getOffsetPoints();
         if (orderPoints == 0) {
@@ -247,7 +247,7 @@ public class OrderRefundController {
         addOrderRefundRecord(orderRefund.getRefundId(), 1, 1, newOrderRefund.getBuyerReason());
 
         //生成待商家审核记录
-        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "的服务单已申请成功，待商家审核");
+        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "你的服务单已申请成功，待商家审核");
 
         orderRefundService.removeById(refundId);
         orderRefundSkuMapper.delete(new LambdaQueryWrapper<OrderRefundSku>().eq(OrderRefundSku::getOrderRefundId, refundId));
@@ -408,7 +408,7 @@ public class OrderRefundController {
         addOrderRefundRecord(orderRefund.getRefundId(), 1, 1, newOrderRefund.getBuyerReason());
 
         //生成待商家审核记录
-        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "的服务单已申请成功，待商家审核");
+        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "你的服务单已申请成功，待商家审核");
 
         //创建海博退款单
         log.info("创建海博退款单，生成海博退款单信息{}", orderRefund);

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

@@ -74,6 +74,7 @@ public class OrderShopDto implements Serializable {
     @ApiModelProperty(value = "优惠券优惠金额", required = true)
     private Double couponMoney;
 
+
     /**
      * 创建时间
      */
@@ -97,6 +98,10 @@ public class OrderShopDto implements Serializable {
     @ApiModelProperty(value = "订单取消时间", required = false)
     private Date cancelTime;
 
+    @ApiModelProperty(value = "订单取消原因", required = true)
+    private String cancelReason;
+
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "订单更新时间", required = false)
     private Date updateTime;

yami-shop-security/yami-shop-security-api/src/main/java/com/yami/shop/security/api/service/impl/MaAppLoginServiceImpl.java

@@ -43,11 +43,7 @@ public class MaAppLoginServiceImpl implements AppLoginService {
                 appConnect.setAppId(authentication.getAppType());
                 appConnect.setBizUserId(session.getOpenid());
                 appConnect.setBizUnionid(session.getUnionid());
-                YamiUser user = SecurityUtils.getUser();
-                System.out.println("登录时回填openId"+user);
-                if (user != null){
-                    appConnect.setUserId(user.getUserId());
-                }
+
                 appConnectService.save(appConnect);
             }
             YamiUser yamiUser = yamiUserDetailsService.loadUserByAppConnect(appConnect);

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

@@ -1099,7 +1099,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                     applyDeal = 1;
                 }
             }
-//            Date date = new Date();
             OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
             if (auditType == 3) {
                 //3：驳回
@@ -1112,7 +1111,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 orderByOrderNumber.setRefundStatus(4);
                 orderService.updateById(orderByOrderNumber);
 
-                //生成待商家审核记录
+                //生成退款驳回记录
                 addOrderRefundRecord(orderRefund.getRefundId(), 20, 3, reason);
             } else {
                 //审核通过

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

@@ -819,7 +819,23 @@
             tp.activity_id,
             tp.sup_id,
             tp.hb_spu_id,
-            tp.hb_status
+            tp.hb_status,
+
+            COALESCE ((
+                          SELECT
+                              SUM( oi2.prod_count )
+                          FROM
+                              tz_order_item oi2
+                                  INNER JOIN tz_order o2 ON o2.order_number = oi2.order_number
+                          WHERE
+                              oi2.shop_id = #{prodByCategoryIdAndShopIdDTO.shopId}
+                            AND oi2.prod_id = tp.prod_id
+                            AND o2.hb_order_status IN ( 20, 30, 40, 70, 80 )
+                            AND o2.delete_status = 0
+                      ),
+                      0
+            ) AS salesVolume
+
         FROM tz_prod tp
                  INNER JOIN tz_category_prod tcp ON tp.prod_id = tcp.prod_id
                    AND tcp.is_delete = 0 AND tcp.shop_id = #{prodByCategoryIdAndShopIdDTO.shopId}