From 2d2bca996af3620b4f7665ae59f384b793d7e6a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 09:10:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java               |    5 +++++
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java         |    4 ++--
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java               |    2 +-
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java      |    6 ++++--
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java    |    3 +++
 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml         |    1 +
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java |    1 +
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java  |    4 +++-
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java      |    4 ++--
 9 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 694eda2..992a1c5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -131,8 +131,8 @@
     @ApiImplicitParams({
             @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
     })
-    @GetMapping("/writeOff/{id}/{shopId}")
-    public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, Integer technicianId){
+    @GetMapping("/writeOff")
+    public R<Void> writeOff(String id, Integer shopId, String technicianId){
         orderService.writeOff(id, shopId, technicianId);
         return R.ok();
     }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 7aa173e..1db9963 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -83,6 +83,9 @@
 		}
 		RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
 				.eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
+		if(null == one){
+			return R.fail("无效的售后数据");
+		}
 		one.setIdStr(one.getId().toString());
 		one.setAddressJson(order.getAddressJson());
 		return R.ok(one);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 76d0db7..823df14 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -26,7 +26,7 @@
 
     boolean check(Order order, Integer shopId, Long userId);
 
-    void writeOff(String id,Integer shopId, Integer technicianId);
+    void writeOff(String id,Integer shopId, String technicianId);
     
     
     /**
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 68e163e..9c40947 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -251,7 +251,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void writeOff(String id,Integer shopId, Integer technicianId) {
+    public void writeOff(String id,Integer shopId, String technicianId) {
         LoginUser loginUserApplet = tokenService.getLoginUserApplet();
         Order order = orderMapper.selectById(id);
         boolean check = check(order, shopId, loginUserApplet.getUserid());
@@ -276,7 +276,9 @@
         order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
         order.setEndTime(LocalDateTime.now());
         order.setCancellerAppUserId(loginUserApplet.getUserid());
-        order.setTechnicianId(technicianId);
+        if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
+            order.setTechnicianId(Integer.valueOf(technicianId));
+        }
         orderMapper.updateById(order);
     }
     
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index 2635f94..a3cf3d9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -111,6 +111,7 @@
 		refundPass.setAddress(jsonObject.getString("address"));
 		this.save(refundPass);
 		order.setOrderStatus(7);
+		order.setOldOrderStatus(7);
 		orderService.updateById(order);
 		return R.ok();
 	}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
index 577cf1f..835ff42 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
@@ -94,7 +94,8 @@
             return R.ok(Page.of(pageNum, pageSize));
         }
         Page<ShopWithdraw> page = shopWithdrawService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<ShopWithdraw>()
-                .in(collect1.size() > 0, ShopWithdraw::getShopId, collect1));
+                .in(collect1.size() > 0, ShopWithdraw::getShopId, collect1)
+        .orderByDesc(ShopWithdraw::getCreateTime));
         List<ShopWithdraw> records = page.getRecords();
         List<Integer> collect = records.stream().map(ShopWithdraw::getShopId).collect(Collectors.toList());
         List<Shop> shops = null;
@@ -141,6 +142,7 @@
         }else {
             byId.setWithdrawAuditMoney(BigDecimal.ZERO);
         }
+        byId.setWithdrawMoney(byId.getWithdrawMoney().subtract(byId.getWithdrawAuditMoney()));
         return R.ok(byId);
     }
     
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 6fbad78..45d27ed 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -589,10 +589,10 @@
                     queryWrapper.eq(GoodsArea::getDistrictsCode, districtCode);
                 }
                 if(StringUtils.isNotEmpty(cityCode)){
-                    queryWrapper.eq(GoodsArea::getCityCode, cityCode);
+                    queryWrapper.and(i -> i.eq(GoodsArea::getCityCode, cityCode).or().isNull(GoodsArea::getCityCode));
                 }
                 if(StringUtils.isNotEmpty(provinceCode)){
-                    queryWrapper.eq(GoodsArea::getProvinceCode, provinceCode);
+                    queryWrapper.and(i -> i.eq(GoodsArea::getProvinceCode, provinceCode).or().isNull(GoodsArea::getProvinceCode));
                 }
                 GoodsArea goodsArea = goodsAreaService.getOne(queryWrapper);
                 if(null == goodsArea){
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
index 072d806..d213b55 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
@@ -68,4 +68,9 @@
     @ApiModelProperty(value = "展示状态:0下架中  1上架中")
     private Integer showStatus;
 
+
+    public Integer getType(){
+        return goodsType;
+    }
+
 }
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
index e867c1b..b5c0016 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/SeckillActivityInfoMapper.xml
@@ -13,6 +13,7 @@
             tgs.selling_price as sellingPrice,
             tgs.integral as integral,
             tg.sale_num as saleNum,
+            tg.type goodsType,
             tsai.start_time as startTime,
             tsai.end_time as endTime
         FROM

--
Gitblit v1.7.1