Skip to content

P
promotion-service
提交 ff5610a9 authored 作者: 000516's avatar 000516 提交者： Coding
浏览文件
操作

被删除（作废的）门店，状态同步到库

Merge Request: 被删除（作废的）门店，状态同步到库 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/308?initial=true
上级 7c22810e 77dcbbc1
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 88 行删除
src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java
浏览文件 @ ff5610a9
......@@ -159,7 +159,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) {
qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike());
}
qw.eq(ActivityPlanInfoDo::getIsDelete, StatusType.VALID.getType());
qw.eq(ActivityPlanInfoDo::getIsDelete,Objects.nonNull(wrapper.getStatusType()) && wrapper.getStatusType().equals(StatusType.INVALID) ? StatusType.INVALID.getType() : StatusType.VALID.getType());
qw.orderByDesc(ActivityPlanInfoDo::getDate)
.orderByAsc(ActivityPlanInfoDo::getPlanStatus)
.orderByDesc(ActivityPlanInfoDo::getClockInTime);
......
src/main/java/com/wangxiaolu/promotion/domain/manage/wrapperQo/ActivityPlanInfoWrapper.java
浏览文件 @ ff5610a9
......@@ -114,6 +114,8 @@ public class ActivityPlanInfoWrapper {
private Integer limitNum;
private StatusType statusType;
public Date getActivityEndDate() {
String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
return DateUtil.parse(format);
......
src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/QinCeClienteleStoreDaoImpl.java
浏览文件 @ ff5610a9
......@@ -45,9 +45,10 @@ public class QinCeClienteleStoreDaoImpl implements QinCeClienteleStoreDao {
try {
QinCeClienteleStoreDO qinCeShopDO = JSONObject.parseObject(responseData.toString(), QinCeClienteleStoreDO.class);
if (qinCeShopDO.getStoreStatus().equals("0")){
continue;
}
// if (qinCeShopDO.getStoreStatus().equals("0") && Objects.nonNull(qinCeShopDO.getQcId())){
// qinCeClienteleStoreMapper.updateStatusById(qinCeShopDO.getQcId());
// continue;
// }
// 添加经销商
List<JSONObject> dealers = qinCeShopDO.getDealers();
......
src/main/java/com/wangxiaolu/promotion/domain/user/mapper/QinCeClienteleStoreMapper.java
浏览文件 @ ff5610a9
......@@ -14,6 +14,7 @@ import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface QinCeClienteleStoreMapper extends BaseMapper<QinCeClienteleStoreDO> {
void updateStatusById(String qcId);
}
......
src/main/resources/application-master.yml 0 → 100644
浏览文件 @ ff5610a9
spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/promotion?autoReconnect=true
username: sfabus
password: Wxl@325Pa91
redis:
port: 6379
host: r-2zehfktt1r34vn4qws.redis.rds.aliyuncs.com
database: 0
password: Wxl2025!@#$
main:
web-application-type: reactive
cloud:
nacos:
discovery:
server-addr: 10.0.0.170:8848
namespace: a9d4d153-3d4e-4d2f-968e-dffdfcc24bab
group: promotion
logging:
config: classpath:logback-spring.xml
async:
executor:
thread:
core_pool_size: 4
name:
prefix: promotion-
wx:
miniapp:
configs:
- appid: wxac14dc7765484d7d
secret: e73b574380a822c942e03ea4dc67aaa1
token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON
temporary:
token_secret: sXwHPj#U#xmim^ts
employee:
token_secret: xZq%kXASSPD$UtL
cx_miniapp:
app_id: wxac14dc7765484d7d
app_secret: e73b574380a822c942e03ea4dc67aaa1
tengxunyun:
# 腾讯云个人账号信息
secret_d: AKIDVt353sWyY0GXn0ANa0YyGdwDIBtjQwGS
secret_key: SBqJcrxypSxeGOPF81mLgsANXo3ALhz7
sms:
#指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com
endpoint_beijing: sms.ap-beijing.tencentcloudapi.com
#地域信息
ap_beijing: ap-beijing
#应用ID（默认应用）
sdk_app_id_defult: 1400903035
#签名内容
sign_name_a: 北京王小卤
#模板ID
template_id_a: 2127434
#验证码过期时间（分钟）
overdue_long: 5
qince:
open_api: https://openapi.region2.qince.com
open_id: 8546408787259919799
app_key: oV0FHfMt81Tii2_kst
# mybatis-plus 打印sql日志
#mybatis-plus:
# configuration:
# log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
# xxl-job配置
xxl:
job:
accessToken: default_token
admin:
addresses: http://10.0.0.170:9001/xxl-job-admin
executor:
appname: promotion-live
port: 9998
logretentiondays: 30
address:
ip: 10.0.0.169
logpath: /var/logs/xxl_job # 执行器日志路径
aliyun:
access-key-id: LTAI5tEvDG8hMRf9tBt9kB3s
access-key-secret: TnH1qRJr95t62pNcVLNopeEhpPxiqe
oss:
region-id: cn-shanghai
sts-role-arm: acs:ram::1819206190412770:role/oss-admin-role
session-name: promotion-live-miniapp
bucket-name: link-promotion
web-js-link: link-promotion.oss-cn-shanghai.aliyuncs.com
\ No newline at end of file
src/main/resources/mapper/QinCeClienteleStoreMapper.xml
浏览文件 @ ff5610a9
......@@ -7,81 +7,27 @@
<resultMap id="BaseResultMap" type="com.wangxiaolu.promotion.domain.user.mapper.entity.QinCeClienteleStoreDO">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="qcId" column="qc_id" jdbcType="VARCHAR"/>
<result property="storeId" column="store_id" jdbcType="VARCHAR"/>
<result property="creatorWaiqinId" column="creator_waiqin_id" jdbcType="VARCHAR"/>
<result property="creatorName" column="creator_name" jdbcType="VARCHAR"/>
<result property="creatorId" column="creator_id" jdbcType="VARCHAR"/>
<result property="returnPoolReason" column="return_pool_reason" jdbcType="VARCHAR"/>
<result property="storeName" column="store_name" jdbcType="VARCHAR"/>
<result property="storeCode" column="store_code" jdbcType="VARCHAR"/>
<result property="storeManager" column="store_manager" jdbcType="VARCHAR"/>
<result property="storeManagerId" column="store_manager_id" jdbcType="VARCHAR"/>
<result property="storeManagerWaiqin365Id" column="store_manager_waiqin365_id" jdbcType="VARCHAR"/>
<result property="storeType" column="store_type" jdbcType="VARCHAR"/>
<result property="storeTypeCode" column="store_type_code" jdbcType="VARCHAR"/>
<result property="storeTypeId" column="store_type_id" jdbcType="VARCHAR"/>
<result property="storeLevelId" column="store_level_id" jdbcType="VARCHAR"/>
<result property="storeLevel" column="store_level" jdbcType="VARCHAR"/>
<result property="storeDeptWaiqin365Id" column="store_dept_waiqin365_id" jdbcType="VARCHAR"/>
<result property="storeDeptId" column="store_dept_id" jdbcType="VARCHAR"/>
<result property="storeDeptName" column="store_dept_name" jdbcType="VARCHAR"/>
<result property="storeDistrict" column="store_district" jdbcType="VARCHAR"/>
<result property="storeDistrictFullPath" column="store_district_full_path" jdbcType="VARCHAR"/>
<result property="storeDistrictWaiqin365Id" column="store_district_waiqin365_id" jdbcType="VARCHAR"/>
<result property="storeThirdDistrictId" column="store_third_district_id" jdbcType="VARCHAR"/>
<result property="storeMssProvince" column="store_mss_province" jdbcType="VARCHAR"/>
<result property="storeMssProvinceCode" column="store_mss_province_code" jdbcType="VARCHAR"/>
<result property="storeMssCity" column="store_mss_city" jdbcType="VARCHAR"/>
<result property="storeMssCityCode" column="store_mss_city_code" jdbcType="VARCHAR"/>
<result property="storeMssArea" column="store_mss_area" jdbcType="VARCHAR"/>
<result property="storeMssAreaCode" column="store_mss_area_code" jdbcType="VARCHAR"/>
<result property="storeMssStreet" column="store_mss_street" jdbcType="VARCHAR"/>
<result property="storeMssStreetCode" column="store_mss_street_code" jdbcType="VARCHAR"/>
<result property="storeAddr" column="store_addr" jdbcType="VARCHAR"/>
<result property="storeCooperateStatusId" column="store_cooperate_status_id" jdbcType="VARCHAR"/>
<result property="storeCooperateStatus" column="store_cooperate_status" jdbcType="CHAR"/>
<result property="storeKaSys" column="store_ka_sys" jdbcType="VARCHAR"/>
<result property="storeTel" column="store_tel" jdbcType="VARCHAR"/>
<result property="storeFax" column="store_fax" jdbcType="VARCHAR"/>
<result property="storePost" column="store_post" jdbcType="VARCHAR"/>
<result property="storeRemarks" column="store_remarks" jdbcType="VARCHAR"/>
<result property="tradingareaBig" column="tradingarea_big" jdbcType="VARCHAR"/>
<result property="tradingarea" column="tradingarea" jdbcType="VARCHAR"/>
<result property="tradingareaLevelCode" column="tradingarea_level_code" jdbcType="VARCHAR"/>
<result property="tradingareaLevelName" column="tradingarea_level_name" jdbcType="VARCHAR"/>
<result property="storeDistrictId" column="store_district_id" jdbcType="VARCHAR"/>
<result property="storeDistrictCode" column="store_district_code" jdbcType="VARCHAR"/>
<result property="storeDistrictCreateTime" column="store_district_create_time" jdbcType="CHAR"/>
<result property="storeDistrictModifyTime" column="store_district_modify_time" jdbcType="CHAR"/>
<result property="storeDistrictCreatorName" column="store_district_creator_name" jdbcType="VARCHAR"/>
<result property="storeDistrictModifyierName" column="store_district_modifyier_name" jdbcType="VARCHAR"/>
<result property="storeDistrictStatus" column="store_district_status" jdbcType="CHAR"/>
<result property="storeRelLevelId" column="store_rel_level_id" jdbcType="VARCHAR"/>
<result property="storeLabel" column="store_label" jdbcType="VARCHAR"/>
<result property="storeLabelId" column="store_label_id" jdbcType="VARCHAR"/>
<result property="storeAssistantId" column="store_assistant_id" jdbcType="VARCHAR"/>
<result property="storeAssistantName" column="store_assistant_name" jdbcType="VARCHAR"/>
<result property="storeRoadMsg" column="store_road_msg" jdbcType="VARCHAR"/>
<result property="storeHouseNumber" column="store_house_number" jdbcType="VARCHAR"/>
<result property="storeLiscenceName" column="store_liscence_name" jdbcType="VARCHAR"/>
<result property="storeRegistrationNo" column="store_registration_no" jdbcType="VARCHAR"/>
<result property="storeRegistrationDate" column="store_registration_date" jdbcType="VARCHAR"/>
<result property="storeOperator" column="store_operator" jdbcType="VARCHAR"/>
<result property="storeSaleDirect" column="store_sale_direct" jdbcType="VARCHAR"/>
<result property="storeModifyTime" column="store_modify_time" jdbcType="VARCHAR"/>
<result property="storeModifyierName" column="store_modifyier_name" jdbcType="VARCHAR"/>
<result property="storeCreateApprovalTime" column="store_create_approval_time" jdbcType="VARCHAR"/>
<result property="storeModifyApprovalTime" column="store_modify_approval_time" jdbcType="VARCHAR"/>
<result property="storeSourceType" column="store_source_type" jdbcType="VARCHAR"/>
<result property="storeSellingArea" column="store_selling_area" jdbcType="VARCHAR"/>
<result property="storeCashiersNum" column="store_cashiers_num" jdbcType="VARCHAR"/>
<result property="storeShelfNum" column="store_shelf_num" jdbcType="VARCHAR"/>
<result property="storeTotalNum" column="store_total_num" jdbcType="VARCHAR"/>
<result property="storeSelfProductNum" column="store_self_product_num" jdbcType="VARCHAR"/>
<result property="storeOpenTime" column="store_open_time" jdbcType="TIMESTAMP"/>
<result property="storeCloseTime" column="store_close_time" jdbcType="TIMESTAMP"/>
<result property="storePictures" column="store_pictures" jdbcType="VARCHAR"/>
<result property="storeLiscence" column="store_liscence" jdbcType="VARCHAR"/>
<result property="storeManagerCode" column="store_manager_code" jdbcType="VARCHAR"/>
<result property="storeCreatorCode" column="store_creator_code" jdbcType="VARCHAR"/>
<result property="storeModifierCode" column="store_modifier_code" jdbcType="VARCHAR"/>
......@@ -90,34 +36,7 @@
<result property="createTime" column="create_time" jdbcType="CHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,qc_id,store_id,
creator_waiqin_id,creator_name,creator_id,
return_pool_reason,store_name,store_code,
store_manager,store_manager_id,store_manager_waiqin365_id,
store_type,store_type_code,store_type_id,
store_level_id,store_level,store_dept_waiqin365_id,
store_dept_id,store_dept_name,store_district,
store_district_full_path,store_district_waiqin365_id,store_third_district_id,
store_mss_province,store_mss_province_code,store_mss_city,
store_mss_city_code,store_mss_area,store_mss_area_code,
store_mss_street,store_mss_street_code,store_addr,
store_cooperate_status_id,store_cooperate_status,store_ka_sys,
store_tel,store_fax,store_post,
store_remarks,tradingarea_big,tradingarea,
tradingarea_level_code,tradingarea_level_name,store_district_id,
store_district_code,store_district_create_time,store_district_modify_time,
store_district_creator_name,store_district_modifyier_name,store_district_status,
store_rel_level_id,store_label,store_label_id,
store_assistant_id,store_assistant_name,store_road_msg,
store_house_number,store_liscence_name,store_registration_no,
store_registration_date,store_operator,store_sale_direct,
store_modify_time,store_modifyier_name,store_create_approval_time,
store_modify_approval_time,store_source_type,store_selling_area,
store_cashiers_num,store_shelf_num,store_total_num,
store_self_product_num,store_open_time,store_close_time,
store_pictures,store_liscence,store_manager_code,
store_creator_code,store_modifier_code,store_approval_status,
store_status,create_time
</sql>
<update id="updateStatusById" >
update qince_clientele_store set store_status = '0' where qc_id = #{qcId}
</update>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论