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

Merge #18 into master from cc_20251114_minor_req

Browse Source 
fix:订货信息新增订货备注并同步主数据；门店编码变更推送新管家

* cc_20251114_minor_req: (11 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch 'master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

  - fix:开店管理修改基本信息资料中门店编码发生变化时推送新管家

  - fix:订货信息新增订货备注并同步主数据

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/18
This commit is contained in:
王非凡
2025-12-26 08:55:27 +00:00
committed by 苏竹红
parent f279db70a3
commit 4b7a35c96c
9 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
<result property="receivingUpdateTime" column="receiving_update_time" jdbcType="TIMESTAMP"/>
<result property="receivingCreateUser" column="receiving_create_user" jdbcType="VARCHAR"/>
<result property="receivingUpdateUser" column="receiving_update_user" jdbcType="VARCHAR"/>
<result property="orderRemark" column="order_remark" jdbcType="VARCHAR"/>
</resultMap>
<sql id="base_colum_list">
id, shop_id, xgj_vice_president, xgj_region_id,xgj_region_name,addresseeName, addressee_mobile, addressee_province, addressee_city,
@@ -39,7 +40,7 @@
warehouse_delivery_date, order_create_time, order_update_time, order_create_user, order_update_user,
receiving_firm_name, receiving_ms_bank_account, receiving_ms_bank_branch, bank_unionPay_account,
receiving_create_time, receiving_update_time, receiving_create_user, receiving_update_user,
declare_goods_type
declare_goods_type, order_remark
</sql>
<insert id="batchInsertSpecific">
<foreach collection="list" item="item" index="index" separator=";">