机具回收修复

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -219,13 +219,7 @@ public class MachineController {
     @GetMapping("/loadRecoverableData")
     public R loadRecoverableData(@RequestParam("userId") Long userId) {
 
-        Integer reDayCount = ParamResolver.getInteger("MACHINE_RE_DAY_COUNT", 15);
-        LocalDateTime endDay = LocalDate.now().minusDays(reDayCount).atStartOfDay();
-        return R.ok(kxsMachineService.count(Wrappers.<KxsMachine>lambdaQuery()
-                        .lt(KxsMachine::getRecycleEndTime, endDay)
-                .eq(KxsMachine::getBindStatus, MachineTypeEnum.NO_BIND.getType())
-                .eq(KxsMachine::getIsAct, MachineTypeEnum.NO_ACT.getType())
-                .eq(KxsMachine::getUserId, userId)));
+        return R.ok(kxsMachineService.loadRecoverableData(userId));
     }
 
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -165,5 +165,12 @@ public interface KxsMachineService extends IService<KxsMachine> {
      */
     List<SysMachinePageVO> machinePage(Page page, SysMachinePageDTO param );
 
+    /**
+     * 可回收数量 内部调用
+     *
+     * @param userId 用户 ID
+     * @return {@link Integer}
+     */
+    Long loadRecoverableData(Long userId);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -439,6 +439,23 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         return list;
     }
 
+    @Override
+    public Long loadRecoverableData(Long userId) {
+        Integer reDayCount = ParamResolver.getInteger("MACHINE_RE_DAY_COUNT", 15);
+        LocalDateTime endDay = LocalDate.now().minusDays(reDayCount).atStartOfDay();
+        //查询回收中的机具排除
+        R<List<String>> listR = remoteKxsStoreService.loadByRecycleSnList();
+        List<String> sns = RetOps.of(listR)
+                .getData()
+                .orElse(new ArrayList<>());
+        return this.count(Wrappers.<KxsMachine>lambdaQuery()
+                .lt(KxsMachine::getRecycleEndTime, endDay)
+                .eq(KxsMachine::getBindStatus, MachineTypeEnum.NO_BIND.getType())
+                .notIn(KxsMachine::getPosSn, sns)
+                .eq(KxsMachine::getIsAct, MachineTypeEnum.NO_ACT.getType())
+                .eq(KxsMachine::getUserId, userId));
+    }
+
     /**
      * 通过条件获取用户id数据
      * @return

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopOrderMapper.xml

@@ -70,13 +70,13 @@
                     </choose>
                     and user_id = #{query.userId}
                 </where>
+                order by create_time desc
                 LIMIT #{start}, #{size}
              ) a
         LEFT JOIN kxs_shop_order_info t  ON a.id = t.order_id
         <where>
             a.user_id = #{query.userId}
         </where>
-        order by a.create_time desc
     </select>
     <select id="getDateBetweenOrders" resultType="com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO">
         SELECT a.id, a.total_price, a.user_id

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineRecycleServiceImpl.java

@@ -307,6 +307,7 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
         //待确认数量
         Integer count = baseMapper.recoverableData(userId);
 
+        //可回收数量
         R<Integer> integerR = remoteKxsProductService.loadRecoverableData(userId, SecurityConstants.FROM_IN);
         Integer recoverableCount = RetOps.of(integerR)
                 .getData()

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineRecycleMapper.xml

@@ -49,6 +49,7 @@
             and del_flag = 0
             and warehouse_user_id = #{query.warehouseUserId}
         </where>
+        order by create_time desc
         LIMIT #{start}, #{size}
         ) a
         LEFT JOIN kxs_machine_recycle_info t ON a.id = t.order_id
@@ -61,7 +62,7 @@
                 concat('%',#{query.keyword},'%'))
             </if>
         </where>
-        order by a.create_time desc
+
     </select>
     <!-- kxs app 回收订单列表分页 map -->
     <resultMap type="com.kxs.store.api.vo.kxsapp.storeRecycle.RecycleUserListVO" id="KxsRecycleUserListVO">
@@ -92,6 +93,7 @@
             and del_flag = 0
             and user_id = #{userId}
         </where>
+        order by create_time desc
         LIMIT #{start}, #{size}
         ) a
         LEFT JOIN kxs_machine_recycle_info t ON a.id = t.order_id
@@ -99,7 +101,7 @@
         <where>
             and t.del_flag = 0
         </where>
-        order by a.create_time desc
+
     </select>
     <select id="needConfirmList" resultType="com.kxs.store.api.vo.kxsapp.storeRecycle.NeedConfirmPosListVO">
         select a.pos_sn, a.recycle_end_time, a.brand_id
@@ -107,6 +109,7 @@
                  left join kxs_machine_recycle b on a.order_id = b.id
         where b.user_id = #{userId}
           and a.status = 0
+        order by b.create_time desc
     </select>
     <select id="recoverableData" resultType="java.lang.Integer">
         select count(*)