fix some bug

mall-service/pom.xml

@@ -221,6 +221,20 @@
             <version>2.2.5</version>
         </dependency>
 
+        <!-- tk.mybatis通用Mapper -->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper</artifactId>
+            <version>4.1.5</version>
+        </dependency>
+        
+        <!-- tk.mybatis通用Mapper Spring Boot Starter -->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.1.5</version>
+        </dependency>
+
     </dependencies>
 
     <build>

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -2759,6 +2759,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
     }
     
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void recycleOrder(List<String> orderNos, Long userId) {
         
         // 回收比例
@@ -2769,7 +2770,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         Example.Criteria criteriaQuery = conditionQuery.createCriteria();
         criteriaQuery.andEqualTo("isDelete", 0);
         criteriaQuery.andEqualTo("uid", userId);
-        criteriaQuery.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY.getKey());
+        criteriaQuery.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey());
         criteriaQuery.andIn("orderId", orderNos);
         
         List<StoreOrder> infoList = this.findByCondition(conditionQuery);
@@ -2778,10 +2779,9 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         }
         
         // 更新订单状态
-        Example.Criteria update = new Example(StoreOrder.class).createCriteria().andIn("orderId", orderNos);
-        StoreOrder storeOrder = new StoreOrder();
-        storeOrder.setStatus(PinkOrderStatusEnum.GROUP_ORDER_RECYCLE.getKey());
-        this.update(storeOrder, update);
+        for (String orderNo : orderNos) {
+            this.updateOrderStatus(orderNo, PinkOrderStatusEnum.GROUP_ORDER_RECYCLE.getKey());
+        }
         // 添加回收数
         userDubboServiceClient.addNumberOfRecycle(userId, orderNos.size());