2020年11月15日 13:15:16

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.java

 package com.cftech.consultsheet.dao;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.cftech.consultsheet.model.ConsultSheet;
 import com.cftech.consultsheet.model.ConsultSheetDto;
 import com.cftech.core.generic.GenericDao;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -19,9 +19,9 @@ import java.util.List;
 */
 public interface ConsultSheetMapper extends GenericDao<ConsultSheet> {
 
-    Integer updateDate(@Param("id") Long id, @Param("status") Long status, @Param("description") String description);
+    Integer updateDate(@Param("id") Long id, @Param("status") String status, @Param("description") String description);
 
-    Integer updateStatus(@Param("id") Long id, @Param("status") Long status);
+    Integer updateStatus(@Param("id") Long id,@Param("status") String status);
 
     List<ConsultSheet> fetchSearchByPage(Conds conds, Sort sort, int page, int pageSize, Long id);
 

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -318,7 +318,7 @@
         where id = #{id}
     </update>
 
-    <update id="updateStatus">
+    <update id="updateStatus" >
         update t_aidea_consult_sheet
         <set>
             <if test="status !=null">

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java

@@ -18,9 +18,9 @@ import java.util.List;
 */
 public interface ConsultSheetService extends GenericService<ConsultSheet> {
 
-    Integer updateDate(Long id, Long status, String description);
+    Integer updateDate(Long id, String status, String description);
 
-    Integer updateStatus(Long id,Long status);
+    Integer updateStatus(Long id, String status);
 
     List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize ,String id);
 

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java

 package com.cftech.consultsheet.service.impl;
 
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cftech.accounts.model.MpAccountsEntity;
 import com.cftech.accounts.service.MpAccountsService;
@@ -23,16 +22,16 @@ import com.cftech.core.util.Constants;
 import com.cftech.core.util.MpTokenUtil;
 import com.cftech.core.util.StringUtils;
 import com.cftech.core.util.SystemConfig;
-import com.cftech.cos.config.cosconfig.model.Cosconfig;
 import com.cftech.member.model.Member;
 import com.cftech.member.service.MemberService;
 import com.cftech.order.service.OrderService;
-import org.mp.api.wxbase.wxmedia.JwMediaAPI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -84,16 +83,16 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
 
 
     @Override
-    public Integer updateDate(Long id, Long status, String description) {
+    public Integer updateDate(Long id, String status, String description) {
         return consultSheetMapper.updateDate(id, status, description);
     }
 
 
 
     @Override
-    public Integer updateStatus(Long id, Long status) {
-        Integer integer = consultSheetMapper.updateStatus(id, status);
-        return integer;
+    public Integer updateStatus(Long id, String status) {
+
+       return consultSheetMapper.updateStatus(id,status);
     }
 
     @Override

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java

@@ -83,6 +83,7 @@ public class ConsultSheetController {
     private AddressService addressService;
 
 
+
     //列表页面
     @RequiresPermissions(value = CONSULTSHEET_VIEW)
     @RequestMapping("/list")
@@ -134,11 +135,12 @@ public class ConsultSheetController {
     //审核拒绝功能
     @RequestMapping(value = "/updateData")
     @ResponseBody
-    public JSONObject updateData(Long id, Long status, String description ,HttpServletRequest request) {
+    public JSONObject updateData(Long id, String status, String description ,HttpServletRequest request) {
         JSONObject rtnJson = new JSONObject();
        ConsultSheet consultSheet = consultSheetService.fetchById(id);
         try {
             if (id!=null && !StringUtils.isEmpty(status) && !StringUtils.isEmpty(description)) {
+
                 Integer integer = consultSheetService.updateDate(id, status, description);
                 if (integer<0) {
                     //发送审核通过模板消息
@@ -182,12 +184,15 @@ public class ConsultSheetController {
     @RequiresPermissions(value = CONSULTSHEET_EDIT)
     @RequestMapping("/updateStatus")
     @ResponseBody
-    public JSONObject updateStatus(Long id, Long status ,HttpServletRequest request) {
+    public JSONObject updateStatus(Long id, String status) {
         JSONObject rtnJson = new JSONObject();
         ConsultSheet consultSheet = consultSheetService.fetchById(id);
         try {
-            if (!StringUtils.isEmpty(id) && !StringUtils.isEmpty(status) ) {
-                Integer integer = consultSheetService.updateStatus(id, status);
+            if (!StringUtils.isEmpty(id) && !StringUtils.isEmpty(id) ) {
+//                ConsultSheet sheet = new ConsultSheet();
+//                sheet.setId(id);
+//                sheet.setStatus(status);
+                Integer integer = consultSheetService.updateStatus(id,status);
                 if (integer>0){
 
                     //生成空订单
@@ -210,9 +215,9 @@ public class ConsultSheetController {
                     }
                     orderService.save(order);
 
-                    //反写咨询单
-                    consultSheet.setOrderId(order.getId());
-                    consultSheetService.update(consultSheet);
+//                    //反写咨询单
+//                    consultSheet.setOrderId(order.getId());
+//                    consultSheetService.update(consultSheet);
 
 
                     //发送审核通过模板消息