创客预发机列表新增地区字段

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/UserAdvanceListInfoVO.java

@@ -45,4 +45,14 @@ public class UserAdvanceListInfoVO implements Serializable {
     @Schema(description = "是否预扣款 0否 1是")
     private Integer isAdvance;
 
+    /**
+     * 地区
+     */
+    private String areas;
+
+    /**
+     * 机具 ID
+     */
+    private Integer machineId;
+
 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineAdvanceMapper.java

@@ -74,7 +74,7 @@ public interface KxsMachineAdvanceMapper extends BaseMapper<KxsMachineAdvance> {
      * @param userId 用户ID
      * @return {@link IPage}<{@link UserAdvanceListVO}>
      */
-    List<UserAdvanceListVO> advanceUserList(long userId);
+    IPage<UserAdvanceListVO> advanceUserList(Page<UserAdvanceListVO> page, @Param("userId") Long userId);
 
     /**
      * 仓库预发机数量

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

@@ -26,6 +26,7 @@ import com.kxs.store.api.model.*;
 import com.kxs.store.api.vo.kxsapp.store.StoreAdvanceMachineVO;
 import com.kxs.store.api.vo.kxsapp.storeAdvance.UserWarehouseListVO;
 import com.kxs.store.api.vo.kxsapp.userAdvance.AdvanceDevModalVO;
+import com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListInfoVO;
 import com.kxs.store.api.vo.kxsapp.userAdvance.UserAdvanceListVO;
 import com.kxs.store.biz.constant.enums.StoreErrorTypeEnum;
 import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
@@ -219,7 +220,7 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
             kxsWarehouseLimit.setCreditAmount(BigDecimal.ZERO);
             kxsWarehouseLimit.setYueForAmount(BigDecimal.ZERO);
             kxsWarehouseLimit.setUsedAmount(BigDecimal.ZERO);
-            kxsWarehouseLimit.setWarehouseType(1);
+            kxsWarehouseLimit.setWarehouseType(WarehouseLimitTypeEnum.XFC.getType());
             kxsWarehouseLimitMapper.insert(kxsWarehouseLimit);
         }
         //预发数量
@@ -383,11 +384,17 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
     @Override
     public IPage<UserAdvanceListVO> advanceUserList(Page<UserAdvanceListVO> page) {
         Long userId = SecurityUtils.getUser().getId();
-
-        List<UserAdvanceListVO> userAdvanceList = baseMapper.advanceUserList(userId);
-        page.setRecords(userAdvanceList);
-        page.setTotal(userAdvanceList.size());
-        return page;
+        IPage<UserAdvanceListVO> listPage = baseMapper.advanceUserList(page, userId);
+        for (UserAdvanceListVO record : listPage.getRecords()) {
+            for (UserAdvanceListInfoVO mch : record.getSnList()) {
+                R<KxsMachine> machineResult = remoteKxsProductService.loadMachineById(mch.getMachineId(), SecurityConstants.FROM_IN);
+                KxsMachine machine = RetOps.of(machineResult)
+                        .getData()
+                        .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.SN_FIND_NULL.getDescription()));
+                mch.setAreas(machine.getDevLocation());
+            }
+        }
+        return listPage;
     }
 
 

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

@@ -112,6 +112,8 @@
             <result column="is_use_amount" property="isUseAmount"/>
             <result column="pos_sn" property="posSn"/>
             <result column="is_advance" property="isAdvance"/>
+            <result column="areas" property="areas"/>
+            <result column="machine_id" property="machineId"/>
         </collection>
     </resultMap>
     <select id="advanceUserList" resultMap="UserAdvanceListMap">
@@ -120,16 +122,17 @@
                b.pos_sn,
                b.create_time,
                b.is_use_amount,
-               b.is_advance
-        from kxs_machine_advance a
+               b.is_advance,
+               b.machine_id
+        from (select * from kxs_machine_advance where del_flag = 0 and to_user_id = #{userId}) a
                  left join kxs_machine_advance_info b on a.id = b.order_id
         where a.del_flag = 0
           and a.to_user_id = #{userId}
           and b.is_apply = 0
           and b.is_return = 0
           and b.is_confirm = 1
-
     </select>
+
     <select id="selectWarehouseUserCount" resultType="java.lang.Long">
         select count(a.id)
         from kxs_machine_advance a