suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #93 into master from cc_20260413_fix

Browse Source 
feat：ai店限制

* cc_20260413_fix: (2 commits squashed)

  - feat：加盟类费用完成 但是可乐机没有完成 设置标识 可乐机完成的时候查询如果有这个标识 更新阶段完成

  - feat：ai店限制

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/93
This commit is contained in:
正新
2026-04-13 09:27:43 +00:00
parent 3602392d8d
commit 1381af4eec
8 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java
View File

@@ -29,7 +29,11 @@ public class PreAllocationRecordDAO {
return preAllocationRecordMapper.queryPageByShopId(shopId);
}
public List<PreAllocationRecordDO> queryPageByPayNo(String payNo) {
public PreAllocationRecordDO queryPageByShopIdAndExpenseType(Long shopId,String expenseType) {
return preAllocationRecordMapper.queryPageByShopIdAndExpenseType(shopId,expenseType);
}
public PreAllocationRecordDO queryPageByPayNo(String payNo) {
return preAllocationRecordMapper.queryPageByPayNo(payNo);
}

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java
View File

@@ -14,7 +14,9 @@ public interface PreAllocationRecordMapper extends Mapper<PreAllocationRecordDO>
List<PreAllocationRecordDO> queryPageByShopId(@Param("shopId") Long shopId);
List<PreAllocationRecordDO> queryPageByPayNo(@Param("payNo") String payNo);
PreAllocationRecordDO queryPageByShopIdAndExpenseType(Long shopId,String expenseType);
PreAllocationRecordDO queryPageByPayNo(@Param("payNo") String payNo);
int updateStatus(@Param("id") Long id, @Param("status") Integer status);

8
coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml
View File

@@ -41,6 +41,14 @@
ORDER BY create_time DESC
</select>
<select id="queryPageByShopIdAndExpenseType" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/>
FROM zxjp_pre_allocation_record
WHERE shop_id = #{shopId}
and expense_type = #{expenseType}
ORDER BY create_time DESC
</select>
<select id="queryPageByPayNo" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/>
FROM zxjp_pre_allocation_record