Merge branch 'feature/202310月零散迭代' into 'master'

Feature/202310月零散迭代

See merge request !1552

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -177,7 +177,6 @@
 			and b.end_time <![CDATA[<=]]> now()
 		</if>
   	  	group by b.plan_id
-  	  	having notSendCount 
   	  	order by b.end_time desc ,  a.create_time desc
   </select>
   

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 import javax.validation.Valid;
 
+import com.gic.haoban.manage.web.qo.StaffAddVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -361,6 +362,17 @@ public class WxStaffController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
 
+    @RequestMapping("/staff-add-json")
+    public HaobanResponse staffAdd(StaffAddVO vo) {
+        logger.info(JSONObject.toJSONString(vo));
+        StaffDTO staffDTO = EntityUtil.changeEntityByJSON(StaffDTO.class,vo) ;
+        String storeId = vo.getStoreId() ;
+        String clerkCode = vo.getClerkCode() ;
+        String commitName = vo.getCommitName() ;
+        Integer version = vo.getVersion() ;
+        return this.staffAdd(staffDTO,storeId,clerkCode,commitName,version) ;
+    }
+
     // 新增店员
     @HttpLimit
     @RequestMapping("/staff-add")

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/StaffAddVO.java

+package com.gic.haoban.manage.web.qo;
+
+import com.gic.haoban.manage.api.dto.StaffDTO;
+
+public class StaffAddVO extends StaffDTO {
+
+    private String storeId ;
+    private String clerkCode ;
+    private String commitName ;
+    private Integer version ;
+
+    @Override
+    public String getStoreId() {
+        return storeId;
+    }
+
+    @Override
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    @Override
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    @Override
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getCommitName() {
+        return commitName;
+    }
+
+    public void setCommitName(String commitName) {
+        this.commitName = commitName;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+}