Merge remote-tracking branch 'origin/master'

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

@@ -33,7 +33,7 @@ define(function (require) {
     return {
       xtype: 'dialog',
       dialogId: 'dialogTugou',
-      title: context.isEdit ? '编辑团购信息' : '新增团购信息',
+      title: context.isEdit ? '取消团购信息' : '新增团购信息',
       width: '100%',
       height: '100%',
       onOpen: function () {
@@ -41,9 +41,9 @@ define(function (require) {
         if (context.isEdit) {
           $.yvan.ajax({
             loadingMask: false,
-            url: api(''),
-            type: 'GET',
-            data: {joId: context.joId},
+            url: api('/getSelectOne'),
+            type: 'POST',
+            data: {jmId: context.jmId},
             success: function (data) {
               $dlg.find('form');
               $form.formSet(data.data);
@@ -61,7 +61,11 @@ define(function (require) {
             $form = $(this);
           },
           items: [
-            [
+            [{
+              name: 'jmId',
+              label: '组团id',
+              xtype: 'hidden',
+            },
               {
                 xtype: 'yvselect',
                 name: 'uptownIds',
@@ -71,6 +75,7 @@ define(function (require) {
                 width: 900,
                 height: 35,
                 validType: 'isBlank',
+                readonly: context.isEdit ? true : false,
                 onChange: function (data) {
                   queryGrid1(data);
                 },
@@ -81,6 +86,7 @@ define(function (require) {
                 label: '组团标题',
                 required: true,
                 maxlength: 20,
+                readonly: context.isEdit ? true : false,
                 width: 450,
                 height: 35, validType: 'isBlank'
               },
@@ -88,39 +94,46 @@ define(function (require) {
                 name: 'tgSupplier', label: '供应商', maxlength: 20,
                 width: 450, height: 35,
                 required: true,
+                readonly: context.isEdit ? true : false,
               },
               [{
                 name: 'tgGoods', label: '团购套餐',
                 required: true, width: 900, height: 35,
-                maxlength: 100,
+                maxlength: 50,
+                readonly: context.isEdit ? true : false,
                 height: '100px', multiline: true,
               }],
               {
                 name: 'tgPrice',
                 label: '单价',
+                readonly: context.isEdit ? true : false,
                 maxlength: 4, validType: 'integer',
                 required: true, width: 450, height: 35,
               },
               {
                 name: 'tgMinNum',
                 label: '最小起订量',
+                readonly: context.isEdit ? true : false,
                 maxlength: 4, validType: 'integer',
                 required: true, width: 450, height: 35,
               },
               [{
                 name: 'tgMaxNum',
+                readonly: context.isEdit ? true : false,
                 label: '最大上限', required: true, validType: 'integer',
                 maxlength: 4, width: 450, height: 35,
               },
                 {
                   name: 'tgEndTime',
                   label: '团购截止时间',
+                  readonly: context.isEdit ? true : false,
                   xtype: 'datetimebox',
                   required: true, width: 450, height: 35,
                 },],
               [{
                 name: 'tgDeliverTime',
                 multiline: true,
+                readonly: context.isEdit ? true : false,
                 xtype: 'datetimebox',
                 label: '预计送货时间',
                 required: true, width: 450, height: 35,
@@ -128,15 +141,16 @@ define(function (require) {
                 {
                   name: 'tgPhoneNumber', validType: 'telNum',
                   label: '联系电话', width: 450, height: 35,
+                  readonly: context.isEdit ? true : false,
                   required: true, maxlength: 11,
                 }],
               [{
-                name: 'remarks',
+                name: 'remark',
                 label: '备注',
                 multiline: true,
                 width: 900,
                 height: '100px',
-                maxlength: 500,
+                maxlength: 100,
               }]]
           ],
         }
@@ -148,13 +162,25 @@ define(function (require) {
               $.yvan.msg('请先选择小区');
               return;
             }
+            if ($form.formGet().tgMinNum > $form.formGet().tgMaxNum) {
+              $.yvan.msg('最大上线必须大于等于最小起订量');
+              return;
+            }
+            if ($form.formGet().tgEndTime > $form.formGet().tgDeliverTime) {
+              $.yvan.msg('团购截止时间必须小于预计送货时间');
+              return;
+            }
+
             console.log($form.formGet())
             $.yvan.postForm($form, {
-              url: (context.isEdit ? api('/record/CustInfo/update') : api('/yeweihui/tgPublish')),
+              url: (context.isEdit ? api('/yeweihui/tgStatus') : api('/yeweihui/tgPublish')),
               success: function (data) {
                 if (data.data == 1) {
                   $.yvan.msg('保存成功');
                   $dlg.window('close');
+                  if ($.type(context.confirm) === 'function') {
+                    context.confirm();
+                  }
                 } else {
                   $.yvan.msg('保存失败');
                 }

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

@@ -4,6 +4,28 @@ define(function (require) {
       var $grid1, $form;
 
 
+      //查询小区
+      function queryGrid2() {
+        var _datas = [];
+        $.yvan.ajax({
+          async: false,
+          method: 'post',
+          url: api('/getAllUptown'),
+          data: {userId: 0},
+          success: function (data) {
+            if (data.data != null && data.data != undefined) {
+              for (var i = 0; i < data.data.length; i++) {
+                _datas.push({
+                  "id": data.data[i].uptownId,
+                  "text": data.data[i].uptownName
+                })
+              }
+            }
+          }
+        });
+        return _datas;
+      }
+
       // 输入搜索文本后点击回车按钮查询列表
       function enterQueryGrid1(e) {
         if (e.keyCode === 13) {
@@ -64,12 +86,9 @@ define(function (require) {
           },
           {
             xtype: 'yvselect',
-            name: 'uptownId',
+            name: 'uptownIds',
             label: '小区',
-            data: [{id: '1', text: '在团'}, {id: '2', text: '发货'}, {id: '3', text: '完成'}, {
-              id: '4',
-              text: '取消'
-            }],
+            data: queryGrid2(),
             multiple: true,
             labelWidth: 'auto',
             width: 350,
@@ -80,7 +99,7 @@ define(function (require) {
           {
             xtype: 'yvselect',
             name: 'tgStatus',
-            label: '状态',//，2，3完成，4取消
+            label: '状态',
             data: [{id: '', text: '全部'}, {id: '1', text: '在团'}, {id: '2', text: '发货'}, {id: '3', text: '完成'}, {
               id: '4',
               text: '取消'
@@ -105,7 +124,7 @@ define(function (require) {
                 require('/app/whepi/tugou/dialogTugou.js')({
                   isEdit: false,
                   confirm: function () {
-                    $grid1.reload();
+                    queryGrid1();
                   }
                 })
               );
@@ -122,21 +141,15 @@ define(function (require) {
                 $.yvan.msg('在团状态才能取消');
                 return;
               }
-              $.yvan.confirm('是否' + "<span style='color: red; font-weight:bold;'>取消</span>" + '[' + (row.joName) + ']任务？', {
-                yes: function (index) {
-                  $.yvan.ajax({
-                    method: 'post',
-                    url: api(''),
-                    data: {
-                      jmId: row.jmId,
-                    },
-                    success: function (data) {
-                      $.yvan.msg('成功');
-                      $grid1.reload();
-                    }
-                  });
-                }
-              });
+              $.yvan.showDialog(this,
+                require('/app/whepi/tugou/dialogTugou.js')({
+                  isEdit: true,
+                  jmId: row.jmId,
+                  confirm: function () {
+                    $grid1.reload();
+                  }
+                })
+              );
             }
           }
         ]
@@ -205,8 +218,19 @@ define(function (require) {
                     {field: 'remark', title: '备注', maxWidth: 200, align: 'left'},
                     {
                       field: 'tgStatus', title: '状态',
-                      align: 'center',
+                      align: 'center', formatter: function (value) {
+                        if (value == 1) {
+                          return '<span style="color: green">在团</span>';
+                        } else if (value == 2) {
+                          return '发货';
+                        } else if (value == 3) {
+                          return '完成';
+                        } else if (value == 4) {
+                          return '<span style="color: red">取消</span>';
+                        }
+                      },
                     },
+                    {field: 'tgStatus', title: '状态', hidden: true},
                   ]
                 ]
             }

whepi-web/src/main/java/com/bofeng/dao/JmTuangouDao.java

@@ -21,7 +21,7 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
   List<JmTuangou> queryTuangouListByUserIdAndTitle(@Param("userId") Long userId, @Param("title") String title);
 
-  List<JmTuangou> whepiTuangoulist(@Param("userId") Long userId, @Param("uptownId") Long uptownId, @Param("queryProperties") String queryProperties, @Param("status") Long status,PageDb pageDb);
+  List<JmTuangou> whepiTuangoulist(@Param("userId") Long userId, @Param("uptownIds") String uptownIds, @Param("queryProperties") String queryProperties, @Param("status") Long status, PageDb pageDb);
 
   JmTuangou selectJmTuangouByJmId(@Param("JmId") Long JmId);
 
@@ -36,4 +36,6 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
   int updateAll(@Param("tg") List<JmTuangou> tg);
 
   JmTuangou selectByUserId();
+
+  JmTuangou getSelectOne(@Param("jmId") Long jmId);
 }

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

@@ -128,11 +128,11 @@ public class JmTuangouService {
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public List<JmTuangou> whepiTuangoulist(Long userId, Long uptownId, String queryProperties, Long status, PageDb pageDb) {
+  public List<JmTuangou> whepiTuangoulist(Long userId, String uptownIds, String queryProperties, Long status, PageDb pageDb) {
 
     buyService.updateStatus();
 
-    return jmTuangouDao.whepiTuangoulist(userId, uptownId, queryProperties, status, pageDb);
+    return jmTuangouDao.whepiTuangoulist(userId, uptownIds, queryProperties, status, pageDb);
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -141,7 +141,7 @@ public class JmTuangouService {
       return jmTuangouDao.updateRemarkByJmId(jmId, remark);
     }
     if (remark.equals("")) {
-
+      return jmTuangouDao.updateStatusByJmId(jmId, status);
     }
     return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
   }
@@ -149,4 +149,8 @@ public class JmTuangouService {
   public JmTuangou selectByUserId() {
     return jmTuangouDao.selectByUserId();
   }
+
+  public JmTuangou getSelectOne(Long jmId){
+    return jmTuangouDao.getSelectOne(jmId);
+  }
 }

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

@@ -357,25 +357,22 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/whepi/yeweihui/tglist")
-  public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownId", required = false) Long uptownId, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "status", required = false) Long status,
-                       PageDb pageDb) {
+  public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownIds", required = false) String uptownIds, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "tgStatus", required = false) Long tgStatus,
+                                PageDb pageDb) {
     //系统管理员只有一个人 获取当前userId
     JmTuangou jmTuangou = jmTuangouService.selectByUserId();
 
-    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(), uptownId, queryProperties, status,pageDb);
+    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(),
+      uptownIds, queryProperties, tgStatus, pageDb);
 
-    return Model.newSuccess(pageDb,myList);
+    return Model.newSuccess(pageDb, myList);
   }
 
   @PostMapping("/whepi/yeweihui/tgPublish")
-  public Model whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) {
+  public ModelOps whepiTuangouPublish(@JsonBody JmTuangou jmTuangou) {
 
-    Integer success = jmTuangouService.whepiTuangouPublish(jmTuangou.getUptownIds(), jmTuangou);
-    if (success == 1) {
-      return Model.newSuccess("操作成功");
-    } else {
-      return Model.newFail("操作失败");
-    }
+    int success = jmTuangouService.whepiTuangouPublish(jmTuangou.getUptownIds(), jmTuangou);
+    return ModelOps.newSuccess(success);
   }
 
   @PostMapping("/yeweihui/tuangou/list/query.json")
@@ -394,8 +391,19 @@ public class YeWeiHuiController {
     return Model.newSuccess(myList);
   }
 
+  @PostMapping("/whepi/yeweihui/tgStatus")
+  public ModelOps whepiYeweihuiTgStatus(@JsonBody JmTuangou jmTuangou) {
+    int success = jmTuangouService.updateRemarkByJmId(jmTuangou.getJmId(),4L, jmTuangou.getRemark());
+    return ModelOps.newSuccess(success);
+  }
+
   @PostMapping("/whepi/getAllUptown")
   public Model<List<Uptown>> getAllUptown(HttpParameterParser parser, PageDb pageDb) {
     return Model.newSuccess(pageDb, uptownMapper.getUptowns(pageDb, parser.getMap()));
   }
+
+  @PostMapping("/whepi/getSelectOne")
+  public Model<JmTuangou> getSelectOne(@Pd(name = "jmId")Long jmId){
+    return Model.newSuccess(jmTuangouService.getSelectOne(jmId));
+  }
 }

whepi-web/src/main/resources/mapper/JmTuangouMapper.xml

@@ -31,13 +31,14 @@
     </select>
 
     <select id="whepiTuangoulist" resultType="com.bofeng.entity.JmTuangou">
-        select a.*,b.uptown_name, IFNULL((select SUM(b.buy_count) FROM jm_buy b where b.jm_id=a.jm_id and buy_status=1),0) as currentNum
+        select a.*,b.uptown_name, IFNULL((select SUM(b.buy_count) FROM jm_buy b where b.jm_id=a.jm_id and
+        buy_status=1),0) as currentNum
         from jm_tuangou a
         inner join sys_uptown b on a.uptown_id=b.uptown_id
         <where>
             a.user_id=#{userId}
-            <if test="uptownId!=null and uptownId!=''">
-                and a.uptown_id=#{uptownId}
+            <if test="uptownIds!=null and uptownIds!=''">
+                and a.uptown_id in (${uptownIds})
             </if>
             <if test="queryProperties!=null and queryProperties!=''">
                 and a.tg_title like concat('%',#{queryProperties},'%')
@@ -81,4 +82,8 @@
     <select id="selectByUserId" resultType="com.bofeng.entity.JmTuangou">
         select * from sys_user limit 1
     </select>
+
+    <select id="getSelectOne" resultType="com.bofeng.entity.JmTuangou">
+        select *,uptown_id as uptownIds from jm_tuangou where jm_id=#{jmId}
+    </select>
 </mapper>