Aidea product update by Strive Date 2020-01-25 增加检测券模块

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html

@@ -269,7 +269,6 @@
             "pagingType": "full_numbers",
             "autowidth": true,
             "scrollX": true,
-            "sScrollY":"480px",
             "aoColumns": [
                 {
                     "mData": "id"

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

@@ -25,6 +25,7 @@ import com.cftech.core.util.SystemConfig;
 import com.cftech.member.service.MemberService;
 import com.cftech.order.model.Order;
 import com.cftech.order.service.OrderService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,7 @@ import java.util.Map;
  * @author Licc
  * @date: 2020-09-22 12:06
  */
+@Slf4j
 @Service("consultSheetService")
 public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> implements ConsultSheetService {
 
@@ -319,8 +321,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         msg = SystemConfig.p.getProperty("QY_SEND_CUSTOMERSERVICE_MSG") + consultSheet.getConsultId();
         List<Qyuser> serviceUsers = new ArrayList();
         serviceUsers.add(service);
-        qyMsgUtil.sendText(accounts, false, serviceUsers, null, null,
+        JSONObject result = qyMsgUtil.sendText(accounts, false, serviceUsers, null, null,
                 agenId, msg, false);
+        log.info("客服，消息发送日志 {}", result.toString());
 
         Qyuser doctor = qyuserService.fetchById(consultSheet.getDoctorId());
         msg = SystemConfig.p.getProperty("QY_SEND_DOCTOR_MSG") + consultSheet.getConsultId();
@@ -328,6 +331,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         doctorUsers.add(doctor);
         qyMsgUtil.sendText(accounts, false, doctorUsers, null, null,
                 agenId, msg, false);
+        log.info("医生，消息发送日志 {}", result.toString());
     }
 
 }
\ No newline at end of file

aidea-modules/order-module/src/main/java/com/cftech/order/job/InitAliasNumberJob.java

+package com.cftech.order.job;
+
+import com.cftech.accounts.model.SysJob;
+import com.cftech.accounts.service.JobService;
+import com.cftech.accounts.service.JobTask;
+import com.cftech.accounts.service.RedisSubPubListener;
+import com.cftech.base.codingrule.service.CodingruleService;
+import com.cftech.core.sql.Conds;
+import com.cftech.core.util.DESUtil;
+import com.cftech.core.util.SpringContextHolder;
+import com.cftech.core.util.SystemConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Job;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * Created by 16444 on 2021/1/4.
+ */
+@Slf4j
+public class InitAliasNumberJob implements Job {
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        boolean isCluster = Boolean.valueOf(SystemConfig.p.getProperty("quartz.isCluster"));
+        if (!isCluster) {
+            return;
+        }
+
+        //获得明细数据
+        JobDataMap jobInfo = context.getJobDetail().getJobDataMap();
+        String id = jobInfo.get("uid") == null ? "" : jobInfo.getString("uid");//这个也是ID主键
+        log.info("任务ID：" + id);
+
+        JobService jobService = SpringContextHolder.getBean(JobService.class);
+        Conds conds = new Conds();
+        conds.equal("clazz_path","com.cftech.order.job.InitAliasNumberJob");
+        conds.equal("del_flag",0);
+        SysJob job = jobService.fetchSearchByConds(conds);
+        job.setDescription("1");//重置别名
+        jobService.update(job);
+
+
+        //执行更新操作
+        if (context.getNextFireTime() != null) {
+            log.info("初始化别名key任务：下次执行时间=====" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(context.getNextFireTime()) + "==============");
+        } else {
+            SysJob sysJob = new SysJob();
+            sysJob.setJobuid(id);
+            sysJob.setStatus("0");
+            jobService.updateStatus(sysJob);
+            log.info("初始化别名key任务，已执行完成！");
+        }
+    }
+}

aidea-modules/pom.xml

@@ -38,7 +38,8 @@
         <module>logistics-module-web</module>
         <module>msgrecord-module</module>
         <module>msgrecord-module-web</module>
-
+        <module>checkcoupon-module</module>
+        <module>checkcoupon-module-web</module>
     </modules>
 
     <dependencies>

portal-web/pom.xml

@@ -322,6 +322,12 @@
             <version>1.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>com.cftech</groupId>
+            <artifactId>checkcoupon-module-web</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
     </dependencies>
     <build>
         <finalName>portal-web</finalName>

qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/api/QyUserUtil.java

@@ -118,7 +118,7 @@ public class QyUserUtil {
         if (!StringUtils.isEmpty(qyuser.getWxno()))
             postObj.put("weixinid", qyuser.getWxno());
 
-        Position position = positionService.fetchById(qyuser.getId());
+        Position position = positionService.fetchById(qyuser.getPositionId());
         if (position != null) {
             postObj.put("position", position.getName());
         }