zxjp-web

Files

王非凡 22fcfc6a90 Merge #111 into master from cc_20260417_bonus

fix:工资奖金

* cc_20260417_bonus: (28 commits squashed)

  - feat:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:工资奖金发放

  - fix:门店实收相关接口

  - fix:新品销售门店级接口

  - fix:新品销售菜品列表接口；规则新增返回id

  - fix:新品销售菜品详情接口

  - fix:新品销售菜品接口补充

  - fix:小程序接口补充

  - fix

  - fix:新增实收、新品销售测试接口

  - fix:新增实收、新品销售测试接口

  - fix

  - fix:新增门店菜品列表接口

  - fix:同规则下无法新增相同菜品规则；新增小程序门店列表接口

  - fix

  - fix:小程序用户获取来源修改

  - fix:实收规则新增上月日均实收字段

  - fix:规则限制

  - fix:小程序上月日均实收

  - fix:查询异常

  - fix:查询异常

  - fix:菜品员工明细字段赋值异常

  - fix:排序

  - fix:排序

  - fix:员工实收列表新增门店筛选条件

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/111

2026-04-27 10:41:08 +00:00

Merge #30 into master from cc_20260106_process_change

2026-01-19 09:11:34 +00:00

bonus

Merge #111 into master from cc_20260417_bonus

2026-04-27 10:41:08 +00:00

closeup

Merge #99 into master from cc_20260408_close_up

2026-04-15 08:23:40 +00:00

config

Merge #81 into master from cc_20260320_standard_expense_Type

2026-03-30 13:20:15 +00:00

decoration

Merge #35 into master from cc_20260128_fix

2026-01-29 09:50:34 +00:00

dict

Merge #48 into master from cc_2021104_twelve_points

2026-03-03 10:48:21 +00:00

fees

Merge #81 into master from cc_20260320_standard_expense_Type

2026-03-30 13:20:15 +00:00

Merge #4 into master from cc_20251027_new2

2025-12-04 09:48:08 +00:00

modify

Merge #52 into master from cc_20260121_store_type

2026-03-10 14:13:03 +00:00

oplog

Merge #37 into master from cc_20251208_visit

2026-02-02 09:56:33 +00:00

order

feat:分账

2026-04-16 18:25:22 +08:00

plan

Merge #30 into master from cc_20260106_process_change

2026-01-19 09:11:34 +00:00

store

Merge #90 into master from cc_20260407_bzj

2026-04-08 11:41:54 +00:00

Merge #48 into master from cc_2021104_twelve_points

2026-03-03 10:48:21 +00:00

visit

Merge #52 into master from cc_20260121_store_type

2026-03-10 14:13:03 +00:00

wallet

feat:独立分账

2026-04-16 11:03:52 +08:00

AcceptanceInfoMapper.xml

fix

2025-07-25 14:07:20 +08:00

AdjustmentOrderMapper.xml

Merge #109 into master from cc_20260420_export

2026-04-24 09:44:31 +00:00

ApplyLicenseMapper.xml

feat:xxl

2025-06-04 17:40:43 +08:00

AssessmentDataMapper.xml

增加查询获取验收列表详情接口

2024-05-11 19:37:47 +08:00

AssessmentTemplateMapper.xml

员工培训

2024-05-07 14:06:43 +08:00

AuditStatusMapper.xml

fixBug

2024-04-29 17:25:09 +08:00

BankdocMapper.xml

区域配置、提交意向金、银行接口

2024-03-28 16:38:27 +08:00

BanktypeMapper.xml

feat:添加银行

2025-04-21 16:13:21 +08:00

BigRegionMapper.xml

Merge #27 into master from cc_20260116_fix

2026-01-19 07:05:53 +00:00

BuildInformationMapper.xml

Merge #102 into master from cc_20260414_invoice

2026-04-17 08:53:50 +00:00

CloseStoreAccountInfoMapper.xml

Merge #8 into master from cc_20250922_closeStore_w

2025-12-09 08:55:47 +00:00

CloseStoreAuditRecordMapper.xml

Merge #8 into master from cc_20250922_closeStore_w

2025-12-09 08:55:47 +00:00

CloseStoreFileDetailMapper.xml

Merge #8 into master from cc_20250922_closeStore_w

2025-12-09 08:55:47 +00:00

CloseStoreFileInfoMapper.xml

Merge #69 into master from cc_20250922_closeStore_w

2026-03-23 09:00:10 +00:00

CloseStoreInfoMapper.xml

Merge #102 into master from cc_20260414_invoice

2026-04-17 08:53:50 +00:00

CloseStoreRefundInfoMapper.xml

Merge #8 into master from cc_20250922_closeStore_w

2025-12-09 08:55:47 +00:00

CloseStoreStageInfoMapper.xml

Merge #8 into master from cc_20250922_closeStore_w

2025-12-09 08:55:47 +00:00

ContractConfigMapper.xml

feat:合同配置

2025-09-09 11:09:57 +08:00

DecorationDesignInfoMapper.xml

装修接口

2025-07-24 15:24:32 +08:00

DecorationMeasureMapper.xml

feat

2025-07-25 10:40:44 +08:00

EmployeeTrainingMapper.xml

考试

2024-06-04 18:13:21 +08:00

enterpriseUserGroupMapper.xml

feat：事项

2025-07-25 17:12:06 +08:00

EnterpriseUserMapper.xml

Merge #49 into master from cc_20260302_login_password

2026-03-03 03:29:16 +00:00

EnterpriseUserRoleMapper.xml

小程序和基础saas功能

2024-03-08 13:48:10 +08:00

EnumInfoDOMapper.xml

fix + 枚举，仓库数据等

2025-04-08 16:38:30 +08:00

ExpenseMappingMapper.xml

Merge #98 into master from cc_20260408_trans

2026-04-14 09:55:00 +00:00

FirstOrderMapper.xml

增加firstorder字段

2024-05-10 09:58:31 +08:00

FranchiseFeeMapper.xml

优化数据处理接口

2025-06-09 13:26:28 +08:00

HomeTemplateMapper.xml

小程序首页模块自定义

2025-04-08 14:23:19 +08:00

HomeTemplateUserMappingMapper.xml

小程序首页模块自定义

2025-04-08 14:23:19 +08:00

HyContentInfoMapper.xml

小程序动态增加类型

2025-06-23 18:37:56 +08:00

HyOpenAreaInfoMapper.xml

fix 开店管理查询条件

2025-01-14 19:03:29 +08:00

HyPartnerLabelGroupMapper.xml

2024-03-25 09:55:22 +08:00

HyPartnerLabelMapper.xml

2024-03-25 09:55:22 +08:00

HyPartnerUserChannelMapper.xml

c端用户

2024-03-20 20:47:11 +08:00

HyPartnerUserInfoMapper.xml

feat:服务号通知异常处理

2025-10-16 16:31:45 +08:00

ImportExcelMapper.xml

多品牌使用

2024-11-05 18:23:00 +08:00

IntentAgreementMapper.xml

条件控制

2024-07-17 15:29:24 +08:00

InvoicingMapper.xml

加盟费付款增加字段，发票回传增加字段

2025-02-11 15:33:07 +08:00

JoinIntentionMapper.xml

加盟意向-审核流程

2024-04-02 16:49:06 +08:00

LineAuditInfoMapper.xml

joinStatus

2024-04-09 20:06:54 +08:00

LineCalendarsEventMapper.xml

fix

2024-05-24 21:41:16 +08:00

LineFollowLogMapper.xml

查找加盟商接口，改造跟进日志接口

2025-01-08 14:19:07 +08:00

LineInfoMapper.xml

Merge #52 into master from cc_20260121_store_type

2026-03-10 14:13:03 +00:00

LineInterviewMapper.xml

fix

2024-05-21 11:17:23 +08:00

LinePayMapper.xml

feat:加盟费处理

2025-08-20 14:25:57 +08:00

MatterConfigMapper.xml

feat：事项配置

2025-07-24 17:28:42 +08:00

MessageTemplateMapper.xml

feat:跳转链接

2025-09-05 13:39:29 +08:00

NewStoreOpeningMapper.xml

筹建部分表init

2024-04-22 13:51:17 +08:00

OldShopMapper.xml

老店

2025-04-12 18:52:03 +08:00

OpenAcceptanceInfoMapper.xml

该店铺已完成试运营

2024-05-11 16:10:57 +08:00

OpeningAcceptanceMapper.xml

Merge #17 into master from cc_20251218_opening

2025-12-25 10:50:38 +00:00

OpeningOperationPlanMapper.xml

增加，门店恢复状态，删除门店接口

2025-03-24 15:01:45 +08:00

OpenNewShopRecordMapper.xml

fix

2024-05-15 15:54:19 +08:00

OperationLogMapper.xml

fix sql

2025-06-27 16:44:44 +08:00

OperationsConsultantAssignMapper.xml

Merge #19 into master from cc_20251223_orgChange

2025-12-31 06:56:47 +00:00

OrderSysInfoMapper.xml

Merge #18 into master from cc_20251114_minor_req

2025-12-26 08:55:27 +00:00

PartnerUserWechatBindMapper.xml

feat:微信通知改造

2025-10-15 10:47:57 +08:00

PlatformBuildMapper.xml

抖音核销手机号

2025-05-26 10:58:36 +08:00

PointAuditRecordMapper.xml

fix

2024-05-07 17:41:32 +08:00

PointDetailInfoMapper.xml

老数据数据处理

2025-05-12 17:12:05 +08:00

PointFinancialDataMapper.xml

Merge #33 into master from cc_20260106_point_update

2026-01-23 06:48:32 +00:00

PointInfoMapper.xml

Merge #71 into master from cc_20260318_wishlist

2026-03-23 11:51:20 +00:00

PointRecommendMapper.xml

fix

2025-04-12 22:55:46 +08:00

PointTodoInfoMapper.xml

Merge #38 into master from cc_20260202_point

2026-02-02 09:56:21 +00:00

PosAndOrderInfoMapper.xml

批量处理云流水订货阶段接口

2025-05-23 16:33:52 +08:00

PreFriedProductsMapper.xml

feat：fry_date

2025-06-25 18:07:41 +08:00

PreFryApprovalRecordsMapper.xml

feat：预炸

2025-06-21 18:39:29 +08:00

PreFryQualificationApplyMapper.xml

增加筛选条件：预炸资质申请管理列表

2025-06-24 18:21:07 +08:00

PreFryRecordsMapper.xml

feat：eid

2025-06-25 22:39:56 +08:00

PreFryStageChangesMapper.xml

feat：排序

2025-06-25 22:52:27 +08:00

QualificationsInfoMapper.xml

Merge #45 into master from cc_20260226_fix

2026-02-26 07:23:29 +00:00

RegionAreaConfigMapper.xml

区域权限信息

2024-03-29 14:18:54 +08:00

RegionMapper.xml

Merge #37 into master from cc_20251208_visit

2026-02-02 09:56:33 +00:00

RegionQrcodeConfigMapper.xml

支付二维码图片

2024-04-25 20:27:59 +08:00

ShopAccountMapper.xml

Merge #13 into master from cc_20251211_jinjian

2025-12-15 09:43:50 +00:00

ShopAuditInfoMapper.xml

视觉验收1.0

2024-05-17 20:57:54 +08:00

ShopDeliveryPlanItemMapper.xml

Merge #91 into master from cc_20230331_device

2026-04-12 09:16:48 +00:00

ShopDeliveryPlanMapper.xml

Merge #91 into master from cc_20230331_device

2026-04-12 09:16:48 +00:00

ShopInfoMapper.xml

Merge #89 into master from cc_20260402_minor_req

2026-04-08 10:44:03 +00:00

ShopRentInfoMapper.xml

fix

2024-04-23 16:38:52 +08:00

ShopStageInfoMapper.xml

Merge #32 into master from cc_20260113_open

2026-01-23 06:49:50 +00:00

ShopStageRemarkInfoMapper.xml

业务备注

2025-05-27 15:22:52 +08:00

SignFranchiseMapper.xml

feat:法大大一期

2025-09-17 15:17:21 +08:00

SplitOrderMapper.xml

Merge #109 into master from cc_20260420_export

2026-04-24 09:44:31 +00:00

StoreGroupMappingMapper.xml

feat：事项

2025-07-25 17:12:06 +08:00

StoreMapper.xml

Merge #99 into master from cc_20260408_close_up

2026-04-15 08:23:40 +00:00

StoreMessageMapper.xml

Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen

2025-10-15 11:28:38 +08:00

SysMenuMapper.xml

小程序和基础saas功能

2024-03-08 13:48:10 +08:00

SysRoleMapper.xml

Merge #59 into master from cc_2021104_twelve_points

2026-03-12 09:29:50 +00:00

SysRoleMenuMapper.xml

小程序和基础saas功能

2024-03-08 13:48:10 +08:00

SystemBuildingShopMapper.xml

多端同时提交

2024-06-05 18:01:14 +08:00

TallyBookDetailMapper.xml

fix

2025-04-01 17:08:40 +08:00

TallyBookMapper.xml

fix

2025-04-01 15:38:13 +08:00

TempUserDetailMapper.xml

培训登记优化

2024-06-21 17:16:36 +08:00

ThirdDepartmentMapper.xml

三方部门表过滤一个

2024-05-29 10:16:59 +08:00

TrainingExperienceMapper.xml

XxlJobHandler

2024-04-07 11:26:44 +08:00

TransferLogMapper.xml

门店转让记录,修改门店招商专员/督导接口

2025-01-08 17:32:54 +08:00

UserAuthMappingMapper.xml

Merge #111 into master from cc_20260417_bonus

2026-04-27 10:41:08 +00:00

UserRegionMappingMapper.xml

小程序和基础saas功能

2024-03-08 13:48:10 +08:00

WarehouseInfoMapper.xml

feat:密码数据处理，验签排除空字符串，导出接口

2025-04-28 22:24:49 +08:00

WithdrawApplicationMapper.xml

Merge #98 into master from cc_20260408_trans

2026-04-14 09:55:00 +00:00