Merge remote-tracking branch 'origin/master'

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -28,10 +28,20 @@
             <p id="cx_p_tgMaxNum" style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
             <p id="cx_p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">个人限额(份):&nbsp;&nbsp;</p>
-            <div style="height: 1vh;"></div>
-            <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            <div style="height: 1vh;"></div>
-            <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+            <div id="cx_showView">
+                <div style="height: 1vh;"></div>
+                <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
+                <div style="height: 1vh;"></div>
+                <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+            </div>
+            <div id="cx_modifyView">
+                <div style="height: 1vh;"></div>
+                <p class="weui-media-box__desc" style="text-indent: -0em;margin-left: 2em;">截止时间：</p>
+                <input id="cx_tg_input_end_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;text-indent: -0em;margin-left: 2em;"/>
+                <div style="height: 1vh;"></div>
+                <p class="weui-media-box__desc" style="text-indent: -0em;margin-left: 2em;">预计送货时间：</p>
+                <input id="cx_tg_input_deliver_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;text-indent: -0em;margin-left: 2em;"/>
+            </div>
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
         </div>
@@ -53,9 +63,23 @@
 
     var operation = ${operation};
 
+    if (operation === 'remark') {
+        $('#cx_showView').hide();
+        $('#cx_modifyView').show();
 
-    $('#cx_p_endTime').append(tgItem.tgEndTime);
-    $('#cx_p_deliverTime').append(tgItem.tgDeliverTime);
+        $('#cx_tg_input_end_time').val(tgItem.tgEndTime);
+        $('#cx_tg_input_deliver_time').val(tgItem.tgDeliverTime);
+
+        $("#cx_tg_input_end_time").datetimePicker();
+        $("#cx_tg_input_deliver_time").datetimePicker();
+    }
+    if (operation === 'cancel') {
+        $('#cx_showView').show();
+        $('#cx_modifyView').hide();
+
+        $('#cx_p_endTime').append(tgItem.tgEndTime);
+        $('#cx_p_deliverTime').append(tgItem.tgDeliverTime);
+    }
 
     if (tgItem.tgMinNum != 0) {
         $('#cx_p_tgMinNum').append(tgItem.tgMinNum);
@@ -83,7 +107,9 @@
 
         let sendData = {
             jmId: tgItem.jmId,
-            remark: inputValue
+            remark: inputValue,
+            endTime: $('#cx_tg_input_end_time').val(),
+            deliverTime: $('#cx_tg_input_deliver_time').val()
         };
 
         if (operation === 'cancel') {

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

@@ -192,13 +192,23 @@ public class JmTuangouService {
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public Integer updateRemarkByJmId(Long jmId, Long status, String remark) {
-    if (status == 0) {
-      return jmTuangouDao.updateRemarkByJmId(jmId, remark);
+  public Integer updateRemarkByJmId(Long jmId, Long status, String remark, String endTime, String deliverTime) {
+    if (status == 0) { // 增补修订
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+      Date tgEndTime = new Date();
+      Date tgDeliverTime = new Date();
+      try {
+        tgEndTime = sdf.parse(endTime);
+        tgDeliverTime = sdf.parse(deliverTime);
+      } catch (ParseException e) {
+        e.printStackTrace();
+      }
+      return jmTuangouDao.updateRemarkByJmIdzbxd(jmId, remark, tgEndTime, tgDeliverTime);
     }
-    if (remark.equals("")) {
+    if (remark.equals("")) {  // 完成
       return jmTuangouDao.updateStatusByJmId(jmId, status);
     }
+    // 取消
     return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
   }
 

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

@@ -362,9 +362,13 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
-  public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
+  public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId,
+                                      @Pd(name = "status", required = false, defaultValue = "0") Long status,
+                                      @Pd(name = "remark", required = false) String remark,
+                                      @Pd(name = "endTime", required = false) String endTime,
+                                      @Pd(name = "deliverTime", required = false) String deliverTime) {
 
-    Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
+    Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark, endTime, deliverTime);
 
     if (success == 1) {
       return Model.newSuccess("操作成功");