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

Merge #90 into master from cc_20260407_bzj

Browse Source 
feat：时间处理

* cc_20260407_bzj: (3 commits squashed)

  - feat：新增设备费用

  - feat：分账

  - feat：时间处理

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/90
This commit is contained in:
正新
2026-04-08 11:41:54 +00:00
parent 68cef4b83a
commit 77ca18b6fc
13 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/order/StoreOrderMapper.xml
View File

@@ -26,6 +26,8 @@
<result column="first_order_fee" property="firstOrderFee" jdbcType="DECIMAL"/>
<result column="contract_deposit" property="contractDeposit" jdbcType="DECIMAL"/>
<result column="original_contract_deposit" property="originalContractDeposit" jdbcType="DECIMAL"/>
<result column="device_deposit" property="deviceDeposit" jdbcType="DECIMAL"/>
<result column="original_device_deposit" property="originalDeviceDeposit" jdbcType="DECIMAL"/>
<result column="design_fee" property="designFee" jdbcType="DECIMAL"/>
<result column="original_design_fee" property="originalDesignFee" jdbcType="DECIMAL"/>
<result column="store_fixed_amount" property="storeFixedAmount" jdbcType="DECIMAL"/>
@@ -46,6 +48,7 @@
management_fee, original_management_fee,
system_usage_fee, original_system_usage_fee,
contract_deposit, original_contract_deposit,
device_deposit, original_device_deposit,
design_fee, original_design_fee,
first_order_fee,
store_fixed_amount, option_amount, total_amount, paid_amount, unpaid_amount,

3
coolstore-partner-dao/src/main/resources/mapper/store/StoreTypeMapper.xml
View File

@@ -22,6 +22,8 @@
<result column="original_system_usage_fee" property="originalSystemUsageFee" jdbcType="DECIMAL"/>
<result column="contract_deposit" property="contractDeposit" jdbcType="DECIMAL"/>
<result column="original_contract_deposit" property="originalContractDeposit" jdbcType="DECIMAL"/>
<result column="device_deposit" property="deviceDeposit" jdbcType="DECIMAL"/>
<result column="original_device_deposit" property="originalDeviceDeposit" jdbcType="DECIMAL"/>
<result column="design_fee" property="designFee" jdbcType="DECIMAL"/>
<result column="original_design_fee" property="originalDesignFee" jdbcType="DECIMAL"/>
<result column="first_order_fee" property="firstOrderFee" jdbcType="DECIMAL"/>
@@ -40,6 +42,7 @@
management_fee, original_management_fee,
system_usage_fee, original_system_usage_fee,
contract_deposit, original_contract_deposit,
device_deposit, original_device_deposit,
design_fee, original_design_fee,
first_order_fee, sort_order,
is_active, deleted, create_time, update_time