Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/tugou/dialogTugou.js

@@ -85,7 +85,7 @@ define(function (require) {
               }],
             [{
               xtype: 'yvselect',
-              name: 'xqType',
+              name: 'tgType',
               label: '需求类型',
               data: [{id: '1', text: '食蔬采购'}, {id: '2', text: '药品采购'}, {id: '3', text: '医疗服务'}, {
                 id: '4',
@@ -198,7 +198,13 @@ define(function (require) {
               $.yvan.msg('团购截止时间必须小于预计送货时间');
               return;
             }
-            console.log($form.formGet())
+            console.log($form.formGet());
+            if (isLoading === true) {
+              return;
+            }
+            else {
+              isLoading = true;
+            }
             $.yvan.postForm($form, {
               url: (context.isEdit ? api('/yeweihui/tgStatus') : api('/yeweihui/tgPublish')),
               success: function (data) {

whepi-doc/group.sql

@@ -49,7 +49,7 @@ ALTER TABLE jm_tuangou
 ADD  tg_max_num     int(11)         NOT NULL DEFAULT 0          COMMENT '最大订量' AFTER tg_min_num;
 
 ALTER TABLE jm_tuangou
-ADD  tg_type        varchar(20)     NOT NULL DEFAULT 0          COMMENT '团购类型' AFTER tg_title,
+ADD  tg_type        int(11)         NOT NULL DEFAULT 0          COMMENT '团购类型' AFTER tg_title,
 ADD  user_create    bigint(20)      NOT NULL DEFAULT 0          COMMENT '新增人',
 ADD  time_create    datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
 ADD  user_update    bigint(20)      NOT NULL DEFAULT 0          COMMENT '修改人',

whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -72,7 +72,16 @@ public class JmTuangouService {
     jmTuangou.setUserUpdate(jmTuangou.getUserId());
     jmTuangou.setTimeUpdate(new Date());
 
-    return jmTuangouDao.insert(jmTuangou);
+    Integer success = jmTuangouDao.insert(jmTuangou);
+
+    if (success == 1) {
+      List<UserOpen> userList = userOpenMapper.getUsersByUptownId(uptownId);
+      for (UserOpen user : userList) {
+        epiTemplateMessageService.tuangouSendRemindMessage(user.getUserId(), user.getOpenId(), tgEndTime);
+      }
+    }
+
+    return success;
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -179,26 +188,6 @@ public class JmTuangouService {
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public Integer zhihuibuTuangouPublish(JmTuangou jmTuangou) {
-
-    jmTuangou.setJmId(IdWorker.getId());
-
-    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(jmTuangou.getUserId());
-    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
-    jmTuangou.setUptownId(uptownId);
-
-    jmTuangou.setTgStatus(1);
-    jmTuangou.setUserId(JwtHelper.getUserId());
-
-    jmTuangou.setUserCreate(JwtHelper.getUserId());
-    jmTuangou.setTimeCreate(new Date());
-    jmTuangou.setUserUpdate(JwtHelper.getUserId());
-    jmTuangou.setTimeUpdate(new Date());
-
-    return jmTuangouDao.insert(jmTuangou);
-  }
-
-  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public Integer zhihuibuUpdateStatus(Long jmId, Long status) {
     return jmTuangouDao.updateStatusByJmId(jmId, status);
   }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -418,18 +418,7 @@ public class YeWeiHuiController {
     return Model.newSuccess(jmTuangouService.getSelectOne(jmId));
   }
 
-  @GetMapping("/whepi/zhihuibu/tgPublish")
-  public Model zhihuibuTuangouPublish(JmTuangou jmTuangou) {
-
-    Integer success = jmTuangouService.zhihuibuTuangouPublish(jmTuangou);
-    if (success == 1) {
-      return Model.newSuccess("操作成功");
-    } else {
-      return Model.newFail("操作失败");
-    }
-  }
-
-  @GetMapping("/whepi/zhihuibu/updateStatus")
+  @PostMapping("/whepi/zhihuibu/updateStatus")
   public Model zhihuibuUpdateStatus(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status) {
 
     Integer success = jmTuangouService.zhihuibuUpdateStatus(jmId, status);

whepi-web/src/main/resources/application-lll.yml

@@ -57,7 +57,7 @@ yvan:
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
       每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
-      系统提醒: 'jZknynqXHF2lOuUKQtXwMsbLE3wvLCyM10sikJ957LY'
+      系统提醒: 'BtF6CRrIAHxx7LEJoVmoCWePqqlK_KSzikbL8aCO8yw'
     #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
     #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: lll
 
   application:
     name: bofeng-web