From 4b7a35c96cb6bd784e4368b5c041c382ff82b6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Fri, 26 Dec 2025 08:55:27 +0000 Subject: [PATCH] Merge #18 into master from cc_20251114_minor_req MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 王非凡 Reviewed-by: 苏竹红 <570057076@qq.com> Merged-by: 苏竹红 <570057076@qq.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/18 --- .../resources/mapper/OrderSysInfoMapper.xml | 3 ++- .../com/cool/store/entity/OrderSysInfoDO.java | 4 ++++ .../cool/store/request/OrderSysInfoRequest.java | 5 +++++ .../com/cool/store/request/StoreMasterDTO.java | 2 ++ .../response/BuildInformationResponse.java | 3 +++ .../impl/BuildInformationServiceImpl.java | 1 + .../service/impl/OrderSysInfoServiceImpl.java | 1 + .../store/service/impl/ShopServiceImpl.java | 17 ++++++++++++++++- .../service/impl/SyncMainSysServerImpl.java | 1 + 9 files changed, 35 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml index 1c219ce46..a27961936 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml @@ -32,6 +32,7 @@ + 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 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java index 1c24e6dbe..dd071b76c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java @@ -121,4 +121,8 @@ public class OrderSysInfoDO { /** 订货方式，0先款后货、1先货后款 */ @Column(name = "order_type") private Integer orderType; + + /** 订货备注 */ + @Column(name = "order_remark") + private String orderRemark; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java index d553473bc..8ca332e17 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java @@ -8,6 +8,7 @@ import com.cool.store.enums.SignTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -98,6 +99,10 @@ public class OrderSysInfoRequest { @ApiModelProperty("订货方式，0先款后货、1先货后款") private Integer orderType; + + @ApiModelProperty("订货备注") + @Length(max = 200, message = "订货备注长度不能超过200") + private String orderRemark; public OrderSysInfoDO toOrderSysInfoDO() { OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java index 7f1e8cc20..2ca634705 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java @@ -91,6 +91,8 @@ public class StoreMasterDTO { private Integer declareGoodsType; @ApiModelProperty("报送货日期 数组格式\"[{\"declareGoods\": \"\",\"deliverGoods\":\"\"}]\"") private String declareGoodsDate; + @ApiModelProperty("订货备注") + private String orderRemark; @ApiModelProperty("营业时间") private String businessHours; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java index 9e3a1fd1f..968d6d334 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java @@ -209,4 +209,7 @@ public class BuildInformationResponse { @ApiModelProperty("订货方式，0先款后货、1先货后款") private Integer orderType; + + @ApiModelProperty("订货备注") + private String orderRemark; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index ea175790d..650adcc0b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -214,6 +214,7 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount()); response.setOrderType(orderSysInfoDO.getOrderType()); + response.setOrderRemark(orderSysInfoDO.getOrderRemark()); WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); if (Objects.nonNull(warehouseInfoDO)) { response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index e95ba45a2..793b36dfe 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -103,6 +103,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { orderSysInfoDO.setDeclareGoodsType(request.getDeclareGoodsType()); orderSysInfoDO.setDeclareGoodsDate(request.getDeclareGoodsDate()); orderSysInfoDO.setWarehouseDeliveryDate(request.getWarehouseDeliveryDate()); + orderSysInfoDO.setOrderRemark(request.getOrderRemark()); if (shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())) { orderSysInfoDO.setOrderCreateTime(new Date()); orderSysInfoDO.setOrderCreateUser(curUserId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index c7a11e2d9..a45f34203 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -112,6 +112,10 @@ public class ShopServiceImpl implements ShopService { StoreService storeService; @Resource EnterpriseService enterpriseService; + @Resource + ShopAccountService shopAccountService; + @Resource + PushService pushService; @Override @@ -444,6 +448,7 @@ public class ShopServiceImpl implements ShopService { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); //缴费阶段之后 加盟模式不能切换为直营店 直营店也不能切换为其他店 ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + String oldShopCode = shopInfo.getShopCode(); if (shopSubStageInfo.getShopSubStageStatus()>ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()){ if (request.getJoinMode()!=shopInfo.getJoinMode()&& (request.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode()||shopInfo.getJoinMode()==JoinModeEnum.FLAGSHIP_STORE.getCode())){ @@ -462,7 +467,17 @@ public class ShopServiceImpl implements ShopService { shopInfo.setFranchiseBrand(request.getFranchiseBrand()); shopInfo.setStoreType(request.getStoreType()); shopInfo.setManagerRegionId(request.getManagerRegionId()); - return shopInfoDAO.updateShopInfo(shopInfo); + Integer f = shopInfoDAO.updateShopInfo(shopInfo); + if (StringUtils.compare(request.getShopCode().trim(), oldShopCode) != 0) { + try { + log.info("门店编码发生修改，推送新管家"); + ZxjpApiRequest data = shopAccountService.getData(request.getShopId(), DownSystemTypeEnum.XGJ); + pushService.pushDataToXGJ(data); + } catch (Exception e) { + log.error("推送新管家失败", e); + } + } + return f; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java index c1ece664a..51af027c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java @@ -169,6 +169,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer { storeMasterDTO.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); storeMasterDTO.setDeclareGoodsType(Integer.valueOf(orderSysInfoDO.getDeclareGoodsType())); storeMasterDTO.setDeclareGoodsDate(orderSysInfoDO.getDeclareGoodsDate()); + storeMasterDTO.setOrderRemark(orderSysInfoDO.getOrderRemark()); } LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); StoreMasterDTO.SignerInfo signerInfo = new StoreMasterDTO.SignerInfo();