Explorar o código

优化 营销功能

wuxw %!s(int64=3) %!d(string=hai) anos
pai
achega
b70e63a8f1

+ 26 - 13
java110-bean/src/main/java/com/java110/dto/classes/ClassesDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.classes;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,14 @@ import java.util.Date;
  **/
 public class ClassesDto extends PageDto implements Serializable {
 
+    public static final String STATE_START = "1001";
+    public static final String STATE_STOP = "2002";
+
     private String classesId;
-private String name;
-private String remark;
-private String state;
-private String storeId;
+    private String name;
+    private String remark;
+    private String state;
+    private String storeId;
 
 
     private Date createTime;
@@ -29,31 +33,40 @@ private String storeId;
     public String getClassesId() {
         return classesId;
     }
-public void setClassesId(String classesId) {
+
+    public void setClassesId(String classesId) {
         this.classesId = classesId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 

+ 1 - 1
java110-db/src/main/resources/mapper/common/MarketLogV1ServiceDaoImplMapper.xml

@@ -21,7 +21,7 @@
         sendWay,t.open_id,t.open_id openId,t.log_id,t.log_id logId,t.community_name,t.community_name
         communityName,t.status_cd,t.status_cd statusCd,t.remark,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id
         communityId,t.person_tel,t.person_tel personTel,t.business_type,t.business_type businessType,mr.`name` ruleName,
-        td.`name` sendWayName,td1.name businessTypeName
+        td.`name` sendWayName,td1.name businessTypeName,t.create_time createTime
         from market_log t
         left join market_rule mr on t.rule_id = mr.rule_id and mr.status_cd = '0'
         LEFT JOIN t_dict td on td.status_cd = t.send_way and td.table_name = 'market_log' and td.table_columns = 'send_way'

+ 3 - 2
service-store/src/main/java/com/java110/store/cmd/classes/SaveClassesCmd.java

@@ -22,6 +22,7 @@ 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.dto.classes.ClassesDto;
 import com.java110.intf.store.IClassesV1InnerServiceSMO;
 import com.java110.po.classes.ClassesPo;
 import com.java110.utils.exception.CmdException;
@@ -55,7 +56,6 @@ public class SaveClassesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
 
     }
 
@@ -63,8 +63,9 @@ Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ClassesPo classesPo = BeanConvertUtil.covertBean(reqJson, ClassesPo.class);
+        ClassesPo classesPo = BeanConvertUtil.covertBean(reqJson, ClassesPo.class);
         classesPo.setClassesId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        classesPo.setState(ClassesDto.STATE_START);
         int flag = classesV1InnerServiceSMOImpl.saveClasses(classesPo);
 
         if (flag < 1) {