Przeglądaj źródła

加入营销规则

wuxw 3 lat temu
rodzic
commit
a1bab13009

+ 86 - 0
java110-bean/src/main/java/com/java110/dto/marketRuleWay/MarketRuleWayDto.java

@@ -0,0 +1,86 @@
+package com.java110.dto.marketRuleWay;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 营销规则方式数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class MarketRuleWayDto extends PageDto implements Serializable {
+
+    private String wayId;
+    private String wayType;
+    private String wayObjId;
+    private String remark;
+    private String ruleId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getWayId() {
+        return wayId;
+    }
+
+    public void setWayId(String wayId) {
+        this.wayId = wayId;
+    }
+
+    public String getWayType() {
+        return wayType;
+    }
+
+    public void setWayType(String wayType) {
+        this.wayType = wayType;
+    }
+
+    public String getWayObjId() {
+        return wayObjId;
+    }
+
+    public void setWayObjId(String wayObjId) {
+        this.wayObjId = wayObjId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

+ 87 - 0
java110-bean/src/main/java/com/java110/po/marketRuleWay/MarketRuleWayPo.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.marketRuleWay;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public class MarketRuleWayPo implements Serializable {
+
+    private String wayId;
+    private String wayType;
+    private String wayObjId;
+    private String statusCd = "0";
+    private String remark;
+    private String ruleId;
+
+    public String getWayId() {
+        return wayId;
+    }
+
+    public void setWayId(String wayId) {
+        this.wayId = wayId;
+    }
+
+    public String getWayType() {
+        return wayType;
+    }
+
+    public void setWayType(String wayType) {
+        this.wayType = wayType;
+    }
+
+    public String getWayObjId() {
+        return wayObjId;
+    }
+
+    public void setWayObjId(String wayObjId) {
+        this.wayObjId = wayObjId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+
+}

+ 102 - 0
java110-db/src/main/resources/mapper/common/MarketRuleWayV1ServiceDaoImplMapper.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="marketRuleWayV1ServiceDaoImpl">
+
+
+    <!-- 保存营销规则方式信息 add by wuxw 2018-07-03 -->
+    <insert id="saveMarketRuleWayInfo" parameterType="Map">
+        insert into market_rule_way(
+        way_id,way_type,way_obj_id,remark,rule_id
+        ) values (
+        #{wayId},#{wayType},#{wayObjId},#{remark},#{ruleId}
+        )
+    </insert>
+
+
+    <!-- 查询营销规则方式信息 add by wuxw 2018-07-03 -->
+    <select id="getMarketRuleWayInfo" parameterType="Map" resultType="Map">
+        select t.way_id,t.way_id wayId,t.way_type,t.way_type wayType,t.way_obj_id,t.way_obj_id
+        wayObjId,t.status_cd,t.status_cd statusCd,t.remark,t.rule_id,t.rule_id ruleId
+        from market_rule_way t
+        where 1 =1
+        <if test="wayId !=null and wayId != ''">
+            and t.way_id= #{wayId}
+        </if>
+        <if test="wayType !=null and wayType != ''">
+            and t.way_type= #{wayType}
+        </if>
+        <if test="wayObjId !=null and wayObjId != ''">
+            and t.way_obj_id= #{wayObjId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改营销规则方式信息 add by wuxw 2018-07-03 -->
+    <update id="updateMarketRuleWayInfo" parameterType="Map">
+        update market_rule_way t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="wayType !=null and wayType != ''">
+            , t.way_type= #{wayType}
+        </if>
+        <if test="wayObjId !=null and wayObjId != ''">
+            , t.way_obj_id= #{wayObjId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            , t.rule_id= #{ruleId}
+        </if>
+        where 1=1
+        <if test="wayId !=null and wayId != ''">
+            and t.way_id= #{wayId}
+        </if>
+
+    </update>
+
+    <!-- 查询营销规则方式数量 add by wuxw 2018-07-03 -->
+    <select id="queryMarketRuleWaysCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from market_rule_way t
+        where 1 =1
+        <if test="wayId !=null and wayId != ''">
+            and t.way_id= #{wayId}
+        </if>
+        <if test="wayType !=null and wayType != ''">
+            and t.way_type= #{wayType}
+        </if>
+        <if test="wayObjId !=null and wayObjId != ''">
+            and t.way_obj_id= #{wayObjId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+
+
+    </select>
+
+</mapper>

+ 4 - 2
java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml

@@ -20,7 +20,8 @@
         t.act_user_name,t.act_user_name actUserName,t.operate,t.sign_type,t.sign_type signType,
         t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,
         t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id actUserId,t.task_id,
-        t.task_id taskId,t.state,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+        t.task_id taskId,t.state,t.original_plan_user_id,t.original_plan_user_id
+        originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
         t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType from business_inspection_task t
         where 1 =1
         <if test="planUserId !=null and planUserId != ''">
@@ -124,7 +125,8 @@
         signType,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name
         planUserName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.act_user_id,t.act_user_id
         actUserId,t.task_id,t.task_id taskId,t.state,td1.name signTypeName,td2.name stateName,ip.inspection_plan_name
-        inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
+        inspectionPlanName,t.original_plan_user_id,t.original_plan_user_id
+        originalPlanUserId,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,
         t.transfer_desc,t.transfer_desc transferDesc,t.task_type,t.task_type taskType
         from inspection_task t,inspection_plan ip,t_dict td1,t_dict td2
         where 1 =1

+ 68 - 0
java110-interface/src/main/java/com/java110/intf/common/IMarketRuleWayV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.marketRuleWay.MarketRuleWayDto;
+import com.java110.po.marketRuleWay.MarketRuleWayPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/marketRuleWayV1Api")
+public interface IMarketRuleWayV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveMarketRuleWay", method = RequestMethod.POST)
+    public int saveMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo);
+
+    @RequestMapping(value = "/updateMarketRuleWay", method = RequestMethod.POST)
+    public int updateMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo);
+
+    @RequestMapping(value = "/deleteMarketRuleWay", method = RequestMethod.POST)
+    public int deleteMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param marketRuleWayDto 数据对象分享
+     * @return MarketRuleWayDto 对象数据
+     */
+    @RequestMapping(value = "/queryMarketRuleWays", method = RequestMethod.POST)
+    List<MarketRuleWayDto> queryMarketRuleWays(@RequestBody MarketRuleWayDto marketRuleWayDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param marketRuleWayDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryMarketRuleWaysCount", method = RequestMethod.POST)
+    int queryMarketRuleWaysCount(@RequestBody MarketRuleWayDto marketRuleWayDto);
+}

+ 70 - 0
service-common/src/main/java/com/java110/common/cmd/marketRule/DeleteMarketRuleWayCmd.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.marketRule;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IMarketRuleWayV1InnerServiceSMO;
+import com.java110.po.marketRuleWay.MarketRuleWayPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 类表述:删除
+ * 服务编码:marketRuleWay.deleteMarketRuleWay
+ * 请求路劲:/app/marketRuleWay.DeleteMarketRuleWay
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "marketRule.deleteMarketRuleWay")
+public class DeleteMarketRuleWayCmd extends Cmd {
+    private static Logger logger = LoggerFactory.getLogger(DeleteMarketRuleWayCmd.class);
+
+    @Autowired
+    private IMarketRuleWayV1InnerServiceSMO marketRuleWayV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "wayId", "wayId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        MarketRuleWayPo marketRuleWayPo = BeanConvertUtil.covertBean(reqJson, MarketRuleWayPo.class);
+        int flag = marketRuleWayV1InnerServiceSMOImpl.deleteMarketRuleWay(marketRuleWayPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 82 - 0
service-common/src/main/java/com/java110/common/cmd/marketRule/ListMarketRuleWayCmd.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.marketRule;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IMarketRuleWayV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.java110.dto.marketRuleWay.MarketRuleWayDto;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述:查询
+ * 服务编码:marketRuleWay.listMarketRuleWay
+ * 请求路劲:/app/marketRuleWay.ListMarketRuleWay
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "marketRule.listMarketRuleWay")
+public class ListMarketRuleWayCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListMarketRuleWayCmd.class);
+    @Autowired
+    private IMarketRuleWayV1InnerServiceSMO marketRuleWayV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        MarketRuleWayDto marketRuleWayDto = BeanConvertUtil.covertBean(reqJson, MarketRuleWayDto.class);
+
+        int count = marketRuleWayV1InnerServiceSMOImpl.queryMarketRuleWaysCount(marketRuleWayDto);
+
+        List<MarketRuleWayDto> marketRuleWayDtos = null;
+
+        if (count > 0) {
+            marketRuleWayDtos = marketRuleWayV1InnerServiceSMOImpl.queryMarketRuleWays(marketRuleWayDto);
+        } else {
+            marketRuleWayDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, marketRuleWayDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

+ 77 - 0
service-common/src/main/java/com/java110/common/cmd/marketRule/SaveMarketRuleWayCmd.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.marketRule;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IMarketRuleWayV1InnerServiceSMO;
+import com.java110.po.marketRuleWay.MarketRuleWayPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 类表述:保存
+ * 服务编码:marketRuleWay.saveMarketRuleWay
+ * 请求路劲:/app/marketRuleWay.SaveMarketRuleWay
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "marketRule.saveMarketRuleWay")
+public class SaveMarketRuleWayCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveMarketRuleWayCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IMarketRuleWayV1InnerServiceSMO marketRuleWayV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
+        Assert.hasKeyAndValue(reqJson, "wayType", "请求报文中未包含wayType");
+        Assert.hasKeyAndValue(reqJson, "wayObjId", "请求报文中未包含wayObjId");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        MarketRuleWayPo marketRuleWayPo = BeanConvertUtil.covertBean(reqJson, MarketRuleWayPo.class);
+        marketRuleWayPo.setWayId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = marketRuleWayV1InnerServiceSMOImpl.saveMarketRuleWay(marketRuleWayPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 73 - 0
service-common/src/main/java/com/java110/common/cmd/marketRule/UpdateMarketRuleWayCmd.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.marketRule;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IMarketRuleWayV1InnerServiceSMO;
+import com.java110.po.marketRuleWay.MarketRuleWayPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述:更新
+ * 服务编码:marketRuleWay.updateMarketRuleWay
+ * 请求路劲:/app/marketRuleWay.UpdateMarketRuleWay
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "marketRule.updateMarketRuleWay")
+public class UpdateMarketRuleWayCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(UpdateMarketRuleWayCmd.class);
+
+
+    @Autowired
+    private IMarketRuleWayV1InnerServiceSMO marketRuleWayV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "wayId", "wayId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       MarketRuleWayPo marketRuleWayPo = BeanConvertUtil.covertBean(reqJson, MarketRuleWayPo.class);
+        int flag = marketRuleWayV1InnerServiceSMOImpl.updateMarketRuleWay(marketRuleWayPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 77 - 0
service-common/src/main/java/com/java110/common/dao/IMarketRuleWayV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+public interface IMarketRuleWayV1ServiceDao {
+
+
+    /**
+     * 保存 营销规则方式信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveMarketRuleWayInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询营销规则方式信息(instance过程)
+     * 根据bId 查询营销规则方式信息
+     * @param info bId 信息
+     * @return 营销规则方式信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getMarketRuleWayInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改营销规则方式信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateMarketRuleWayInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询营销规则方式总数
+     *
+     * @param info 营销规则方式信息
+     * @return 营销规则方式数量
+     */
+    int queryMarketRuleWaysCount(Map info);
+
+}

+ 113 - 0
service-common/src/main/java/com/java110/common/dao/impl/MarketRuleWayV1ServiceDaoImpl.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.common.dao.IMarketRuleWayV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述:
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Service("marketRuleWayV1ServiceDaoImpl")
+public class MarketRuleWayV1ServiceDaoImpl extends BaseServiceDao implements IMarketRuleWayV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(MarketRuleWayV1ServiceDaoImpl.class);
+
+
+    /**
+     * 保存营销规则方式信息 到 instance
+     *
+     * @param info bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveMarketRuleWayInfo(Map info) throws DAOException {
+        logger.debug("保存 saveMarketRuleWayInfo 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.insert("marketRuleWayV1ServiceDaoImpl.saveMarketRuleWayInfo", info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询营销规则方式信息(instance)
+     *
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getMarketRuleWayInfo(Map info) throws DAOException {
+        logger.debug("查询 getMarketRuleWayInfo 入参 info : {}", info);
+
+        List<Map> businessMarketRuleWayInfos = sqlSessionTemplate.selectList("marketRuleWayV1ServiceDaoImpl.getMarketRuleWayInfo", info);
+
+        return businessMarketRuleWayInfos;
+    }
+
+
+    /**
+     * 修改营销规则方式信息
+     *
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateMarketRuleWayInfo(Map info) throws DAOException {
+        logger.debug("修改 updateMarketRuleWayInfo 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.update("marketRuleWayV1ServiceDaoImpl.updateMarketRuleWayInfo", info);
+
+        return saveFlag;
+    }
+
+    /**
+     * 查询营销规则方式数量
+     *
+     * @param info 营销规则方式信息
+     * @return 营销规则方式数量
+     */
+    @Override
+    public int queryMarketRuleWaysCount(Map info) {
+        logger.debug("查询 queryMarketRuleWaysCount 入参 info : {}", info);
+
+        List<Map> businessMarketRuleWayInfos = sqlSessionTemplate.selectList("marketRuleWayV1ServiceDaoImpl.queryMarketRuleWaysCount", info);
+        if (businessMarketRuleWayInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessMarketRuleWayInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 90 - 0
service-common/src/main/java/com/java110/common/smo/impl/MarketRuleWayV1InnerServiceSMOImpl.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.smo.impl;
+
+
+import com.java110.common.dao.IMarketRuleWayV1ServiceDao;
+import com.java110.intf.common.IMarketRuleWayV1InnerServiceSMO;
+import com.java110.dto.marketRuleWay.MarketRuleWayDto;
+import com.java110.po.marketRuleWay.MarketRuleWayPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-10-26 17:19:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@RestController
+public class MarketRuleWayV1InnerServiceSMOImpl extends BaseServiceSMO implements IMarketRuleWayV1InnerServiceSMO {
+
+    @Autowired
+    private IMarketRuleWayV1ServiceDao marketRuleWayV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo) {
+        int saveFlag = marketRuleWayV1ServiceDaoImpl.saveMarketRuleWayInfo(BeanConvertUtil.beanCovertMap(marketRuleWayPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo) {
+        int saveFlag = marketRuleWayV1ServiceDaoImpl.updateMarketRuleWayInfo(BeanConvertUtil.beanCovertMap(marketRuleWayPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteMarketRuleWay(@RequestBody MarketRuleWayPo marketRuleWayPo) {
+        marketRuleWayPo.setStatusCd("1");
+        int saveFlag = marketRuleWayV1ServiceDaoImpl.updateMarketRuleWayInfo(BeanConvertUtil.beanCovertMap(marketRuleWayPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<MarketRuleWayDto> queryMarketRuleWays(@RequestBody MarketRuleWayDto marketRuleWayDto) {
+
+        //校验是否传了 分页信息
+
+        int page = marketRuleWayDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            marketRuleWayDto.setPage((page - 1) * marketRuleWayDto.getRow());
+        }
+
+        List<MarketRuleWayDto> marketRuleWays = BeanConvertUtil.covertBeanList(marketRuleWayV1ServiceDaoImpl.getMarketRuleWayInfo(BeanConvertUtil.beanCovertMap(marketRuleWayDto)), MarketRuleWayDto.class);
+
+        return marketRuleWays;
+    }
+
+
+    @Override
+    public int queryMarketRuleWaysCount(@RequestBody MarketRuleWayDto marketRuleWayDto) {
+        return marketRuleWayV1ServiceDaoImpl.queryMarketRuleWaysCount(BeanConvertUtil.beanCovertMap(marketRuleWayDto));
+    }
+
+}