java
/
crmproject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

营销活动增加 活动名称和规则类型

This commit is contained in:
liujie 2024-04-12 12:11:17 +08:00
parent 153b05325c
commit 69f6da2d54
13 changed files with 90 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crm-admin/src/main/java/com/yb/lb/webapp/system/PrizeGoodsRuleApi.java
View File

@ -40,6 +40,8 @@ public class PrizeGoodsRuleApi extends BaseController {
@ApiOperation("非分页查询")
@PostMapping(value = "/findList")
public Map<String, Object> findList(
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = false, value = "规则类型") @RequestParam(required = false) String ruleType,
HttpServletRequest request) {
Map<String, Object> params = new HashMap<>();
// String token = request.getHeader("token");
@ -47,6 +49,8 @@ public class PrizeGoodsRuleApi extends BaseController {
// return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
// }
params.put("status", FINALCMD.NORMAL);
params.put("activityName", activityName);
params.put("ruleType", ruleType);
return toAjax(prizeGoodsRuleService.findList(params, ".findPrizeGoodsRuleByCondition"));
}
@ -58,10 +62,14 @@ public class PrizeGoodsRuleApi extends BaseController {
@ApiOperation("查询活动规则")
@PostMapping(value = "/findDetailList")
public Map<String, Object> findDetailList(
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = false, value = "规则类型") @RequestParam(required = false) String ruleType,
@ApiParam(required = false, value = "活动id") @RequestParam(required = false) String ruleId,
HttpServletRequest request) {
Map<String, Object> params = new HashMap<>();
params.put("ruleId", ruleId);
params.put("activityName", activityName);
params.put("ruleType", ruleType);
params.put("status", FINALCMD.NORMAL);
return toAjax(prizeGoodsRuleService.findDetailList(params, ".findRulesTextByCondition"));
}

12
crm-admin/src/main/java/com/yb/lb/webapp/system/PrizeGoodsRuleController.java
View File

@ -123,6 +123,8 @@ public class PrizeGoodsRuleController extends BaseController {
@PostMapping(value = "/pageList")
public Map<String, Object> pageList(
@ApiParam(required = false, value = "0.停用 1.启用") @RequestParam(required = false) String status,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = false, value = "规则类型") @RequestParam(required = false) String ruleType,
@ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(required = true) String page,
@ApiParam(required = true, value = "显示数量", defaultValue = "10") @RequestParam(required = true) String pageSize,
HttpServletRequest request) {
@ -133,6 +135,8 @@ public class PrizeGoodsRuleController extends BaseController {
return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
}
params.put("status", status);
params.put("activityName", activityName);
params.put("ruleType", ruleType);
params.put("page", page);
params.put("pageSize", pageSize);
return toPage(prizeGoodsRuleService.pageList(params, ".findPrizeGoodsRuleByCondition"));
@ -147,6 +151,8 @@ public class PrizeGoodsRuleController extends BaseController {
@PostMapping(value = "/findList")
public Map<String, Object> findList(
@ApiParam(required = false, value = "0.停用 1.启用") @RequestParam(required = false) String status,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = false, value = "规则类型") @RequestParam(required = false) String ruleType,
HttpServletRequest request) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> params = new HashMap<>();
@ -154,6 +160,8 @@ public class PrizeGoodsRuleController extends BaseController {
if (!redisService.isKey(token)) {
return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
}
params.put("activityName", activityName);
params.put("ruleType", ruleType);
params.put("status", status);
return toAjax(prizeGoodsRuleService.findList(params, ".findPrizeGoodsRuleByCondition"));
}
@ -167,6 +175,8 @@ public class PrizeGoodsRuleController extends BaseController {
@PostMapping(value = "/findDetailList")
public Map<String, Object> findDetailList(
@ApiParam(required = true, value = "活动id") @RequestParam(required = true) String ruleId,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = false, value = "规则类型") @RequestParam(required = false) String ruleType,
HttpServletRequest request) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> params = new HashMap<>();
@ -175,6 +185,8 @@ public class PrizeGoodsRuleController extends BaseController {
return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
}
params.put("ruleId", ruleId);
params.put("activityName", activityName);
params.put("ruleType", ruleType);
return toAjax(prizeGoodsRuleService.findDetailList(params, ".findRulesTextByCondition"));
}

4
crm-admin/src/main/java/com/yb/lb/webapp/system/PrizeMeetingRuleApi.java
View File

@ -45,6 +45,7 @@ public class PrizeMeetingRuleApi extends BaseController {
@ApiParam(required = false, value = "0.关闭 1.开启") @RequestParam(required = false) String status,
@ApiParam(required = false, value = "创建开始日期") @RequestParam(required = false) String startDate,
@ApiParam(required = false, value = "创建结束日期") @RequestParam(required = false) String endDate,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(required = true) String page,
@ApiParam(required = true, value = "显示数量", defaultValue = "10") @RequestParam(required = true) String pageSize,
HttpServletRequest request) {
@ -60,6 +61,7 @@ public class PrizeMeetingRuleApi extends BaseController {
params.put("status", status);
params.put("startDate", startDate);
params.put("endDate", endDate);
params.put("activityName", activityName);
params.put("page", page);
params.put("pageSize", pageSize);
return toPage(prizeMeetingRuleService.pageList(params, ".findCrmPrizeMeetingRuleByCondition"));
@ -77,6 +79,7 @@ public class PrizeMeetingRuleApi extends BaseController {
@ApiParam(required = false, value = "0.关闭 1.开启") @RequestParam(required = false) String status,
@ApiParam(required = false, value = "创建开始日期") @RequestParam(required = false) String startDate,
@ApiParam(required = false, value = "创建结束日期") @RequestParam(required = false) String endDate,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
HttpServletRequest request) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> params = new HashMap<>();
@ -90,6 +93,7 @@ public class PrizeMeetingRuleApi extends BaseController {
params.put("status", status);
params.put("startDate", startDate);
params.put("endDate", endDate);
params.put("activityName", activityName);
return toAjax(prizeMeetingRuleService.findList(params, ".findCrmPrizeMeetingRuleByCondition"));
}

4
crm-admin/src/main/java/com/yb/lb/webapp/system/PrizeMeetingRuleController.java
View File

@ -99,6 +99,7 @@ public class PrizeMeetingRuleController extends BaseController {
@ApiParam(required = false, value = "客户id") @RequestParam(required = false) String clientId,
@ApiParam(required = false, value = "业务员id") @RequestParam(required = false) String staffId,
@ApiParam(required = false, value = "创建人名称") @RequestParam(required = false) String createName,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
@ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(required = true) String page,
@ApiParam(required = true, value = "显示数量", defaultValue = "10") @RequestParam(required = true) String pageSize,
HttpServletRequest request) {
@ -117,6 +118,7 @@ public class PrizeMeetingRuleController extends BaseController {
params.put("clientId", clientId);
params.put("staffId", staffId);
params.put("createName", createName);
params.put("activityName", activityName);
params.put("page", page);
params.put("pageSize", pageSize);
return toPage(prizeMeetingRuleService.pageList(params, ".findCrmPrizeMeetingRuleByCondition"));
@ -137,6 +139,7 @@ public class PrizeMeetingRuleController extends BaseController {
@ApiParam(required = false, value = "客户id") @RequestParam(required = false) String clientId,
@ApiParam(required = false, value = "业务员id") @RequestParam(required = false) String staffId,
@ApiParam(required = false, value = "创建人名称") @RequestParam(required = false) String createName,
@ApiParam(required = false, value = "活动名称") @RequestParam(required = false) String activityName,
HttpServletRequest request) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> params = new HashMap<>();
@ -153,6 +156,7 @@ public class PrizeMeetingRuleController extends BaseController {
params.put("clientId", clientId);
params.put("staffId", staffId);
params.put("createName", createName);
params.put("activityName", activityName);
return toAjax(prizeMeetingRuleService.findList(params, ".findCrmPrizeMeetingRuleByCondition"));
}

1
crm-admin/src/main/java/com/yb/lb/webapp/thread/records/RecordsThread.java
View File

@ -39,6 +39,7 @@ public class RecordsThread implements Runnable {
PrizeGoodsRuleService prizeGoodsRuleService = SpringUtils.getBean(PrizeGoodsRuleService.class);
Map<String, Object> addMap = new HashMap<>();
addMap.put("status", "1");
addMap.put("ruleType", "1");
CrmPrizeGoodsRule activityRules = prizeGoodsRuleService.oneById(addMap, ".findPrizeGoodsRuleByCondition");
addMap.clear();
addMap.put("id", IdUtil.simpleUUID());

21
crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsRuleMapper.xml
View File

@ -39,6 +39,12 @@
<if test="status != null and status != ''">
AND a.status = #{status}
</if>
<if test="activityName != null and activityName != ''">
AND a.ACTIVITY_NAME like '%' || #{activityName} || '%'
</if>
<if test="ruleType != null and ruleType != ''">
AND a.RULE_TYPE = #{ruleType}
</if>
ORDER BY a.create_time DESC
</select>
@ -50,6 +56,9 @@
<if test="prizeType != null and prizeType != ''">
AND prize_type = #{prizeType}
</if>
<if test="ruleType != null and ruleType != ''">
AND RULE_TYPE = #{ruleType}
</if>
<if test="companyId != null and companyId != ''">
AND company_id = #{companyId}
</if>
@ -59,7 +68,7 @@
<insert id="insertPrizeGoodsRule" parameterType="map">
INSERT INTO crm_prize_goods_rule (
id, prize_type, dealer_in_prize, dealer_out_prize, operator_prize, create_time, create_user,
company_id, status, remark, start_time, end_time
company_id, status, remark, start_time, end_time,ACTIVITY_NAME,RULE_TYPE
) VALUES (
#{id,jdbcType=VARCHAR},
#{prizeType,jdbcType=VARCHAR},
@ -72,7 +81,9 @@
#{status,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR},
#{startTime,jdbcType=VARCHAR},
#{endTime,jdbcType=VARCHAR}
#{endTime,jdbcType=VARCHAR},
#{activityName,jdbcType=VARCHAR},
#{ruleType,jdbcType=VARCHAR}
)
</insert>
@ -104,6 +115,12 @@
<if test="endTime != null">
end_time = #{endTime,jdbcType=VARCHAR},
</if>
<if test="activityName != null">
ACTIVITY_NAME = #{activityName,jdbcType=VARCHAR},
</if>
<if test="ruleType != null">
RULE_TYPE = #{ruleType,jdbcType=VARCHAR},
</if>
</set>
WHERE id = #{id}
</update>

12
crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeGoodsTextMapper.xml
View File

@ -32,6 +32,12 @@
<if test="status != null and status != ''">
AND a.status = #{status}
</if>
<if test="activityName != null and activityName != ''">
AND a.ACTIVITY_NAME like '%' || #{activityName} || '%'
</if>
<if test="ruleType != null and ruleType != ''">
AND a.RULE_TYPE = #{ruleType}
</if>
</select>
<!-- 插入数据 -->
@ -51,7 +57,7 @@
<!-- 批量插入数据 -->
<insert id="insertRulesTexts" parameterType="list">
INSERT INTO crm_prize_goods_text (
id, prize_type, rule_id, status, text, create_time
id, prize_type, rule_id, status, text, create_time,ACTIVITY_NAME,RULE_TYPE
)
<foreach collection="list" index="index" item="item" separator="UNION ALL">
SELECT
@ -60,7 +66,9 @@
#{item.ruleId,jdbcType=VARCHAR},
#{item.status,jdbcType=VARCHAR},
#{item.text,jdbcType=VARCHAR},
#{item.createTime,jdbcType=VARCHAR}
#{item.createTime,jdbcType=VARCHAR},
#{item.activityName,jdbcType=VARCHAR},
#{item.ruleType,jdbcType=VARCHAR}
FROM DUAL
</foreach>
</insert>

11
crm-common/src/main/resources/mapper/mapper_oracle/system/PrizeMeetingRuleMapper.xml
View File

@ -72,6 +72,9 @@
AND TO_CHAR(TO_DATE(SUBSTR(a.create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &lt;=
TO_CHAR(TO_DATE(SUBSTR(#{endDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
</if>
<if test="activityName != null and activityName != ''">
AND a.ACTIVITY_NAME like '%' || #{activityName} || '%'
</if>
</where>
ORDER BY a.create_time DESC
</select>
@ -80,7 +83,7 @@
<insert id="addCrmPrizeMeetingRule">
INSERT INTO crm_prize_meeting_rule (
id, division_mode, min_amount, max_amount, rp_num, used_num, rp_amount, start_time,
end_time, status, client_id, staff_id, company_id, create_time, create_user, remark
end_time, status, client_id, staff_id, company_id, create_time, create_user, remark,ACTIVITY_NAME
) VALUES (
#{id,jdbcType=VARCHAR},
#{divisionMode,jdbcType=VARCHAR},
@ -97,7 +100,8 @@
#{companyId,jdbcType=VARCHAR},
#{createTime,jdbcType=VARCHAR},
#{createUser,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}
#{remark,jdbcType=VARCHAR},
#{activityName,jdbcType=VARCHAR}
)
</insert>
@ -141,6 +145,9 @@
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="activityName != null">
ACTIVITY_NAME = #{activityName,jdbcType=VARCHAR},
</if>
</set>
WHERE id = #{id}
</update>

1
crm-webapp/src/main/java/com/yb/lb/webapp/record/prize/service/RecordsPrizeService.java
View File

@ -55,6 +55,7 @@ public class RecordsPrizeService {
Map<String, Object> params = new HashMap<>();
// 查询奖励设置
params.put("status", FINALCMD.NORMAL);
params.put("ruleType", "2");
CrmPrizeGoodsRule activityRules = prizeGoodsRuleService.oneById(params, ".findPrizeGoodsRuleByCondition");
if (activityRules == null) {
throw new CustomException("请先设置奖励规则,否则无法领取到奖励", ErrorUtils.ERROR);

8
crm-webapp/src/main/java/com/yb/lb/webapp/system/prizerule/entity/CrmPrizeGoodsRule.java
View File

@ -61,4 +61,12 @@ public class CrmPrizeGoodsRule implements java.io.Serializable {
/** 活动结束时间 */
@ApiModelProperty(value = "活动结束时间", required = true)
private String endTime;
/** 活动名称 */
@ApiModelProperty(value = "活动名称", required = true)
private String activityName;
/** 规则类型 */
@ApiModelProperty(value = "规则类型", required = true)
private String ruleType;
}

8
crm-webapp/src/main/java/com/yb/lb/webapp/system/prizerule/entity/CrmPrizeGoodsText.java
View File

@ -34,6 +34,14 @@ public class CrmPrizeGoodsText implements java.io.Serializable {
@ApiModelProperty(value = "规则描述")
private String text;
/** 规则类型 */
@ApiModelProperty(value = "规则类型")
private String ruleType;
/** 活动名称 */
@ApiModelProperty(value = "活动名称")
private String activityName;
/** 添加时间 */
@ApiModelProperty(hidden = true)
private String createTime;

4
crm-webapp/src/main/java/com/yb/lb/webapp/system/prizerule/entity/CrmPrizeMeetingRule.java
View File

@ -90,4 +90,8 @@ public class CrmPrizeMeetingRule implements java.io.Serializable {
@ApiModelProperty(hidden = true)
private String staffName;
/** 活动名称 */
@ApiModelProperty(value = "活动名称", required = true)
private String activityName;
}

2
crm-webapp/src/main/java/com/yb/lb/webapp/system/prizerule/service/PrizeGoodsRuleService.java
View File

@ -41,6 +41,8 @@ public class PrizeGoodsRuleService {
rulesText.setRuleId(info.getId());
rulesText.setPrizeType(info.getPrizeType());
rulesText.setStatus(info.getStatus());
rulesText.setRuleType(info.getRuleType());
rulesText.setActivityName(info.getActivityName());
rulesText.setCreateTime(info.getCreateTime());
}
detailDao.add_obj(CrmPrizeGoodsText.class.getName() + ".insertRulesTexts", textList);