浏览代码

业主购买2月10号

guojing 5 年之前
父节点
当前提交
352e4681a3

+ 2 - 2
whepi-ui/templates/home/buy.ftl

@@ -138,13 +138,13 @@
             if (v.buyStatus != 1) {
                 return $.alert("该订单已经取消");
             }
-            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 2 + "&tgStatus=" + v.tgStatus;
+            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 2 + "&tgStatus=" + v.tgStatus+"&buyId="+v.buyId;
         }
 
 
         /*居民求助信息*/
         function myBuyClick(v) {
-            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 1 + "&tgStatus=" + v.tgStatus;
+            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 1 + "&tgStatus=" + v.tgStatus+"&buyId="+1;
         }
 
 

+ 17 - 9
whepi-ui/templates/home/buyClient.ftl

@@ -17,7 +17,7 @@
             <div style="display: inline;">
                 <input type="text" id="buyCount"
                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 50%;font-size: 16px;margin-top: 1vh;"
-                       maxlength="3" onkeyup="this.value=this.value.replace(/[^0-9-]+/,'');" min="1"
+                       maxlength="10" onkeyup="this.value=this.value.replace(/[^0-9-]+/,'');" min="1"
                        onchange="changeBuy()">
             </div>
         </div>
@@ -37,17 +37,21 @@
         </div>
     </div>
     <div style=" flex-direction: row; justify-content: space-between;">
-        <div style="display: inline;align-items: flex-start"">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</div>
-        <textarea id="Myremarks" class="weui-textarea" placeholder="输入内容(200字内)" rows="3"
-                  style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;" ></textarea>
+        <div style="display: inline;align-items: flex-start"
+        ">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:
     </div>
+    <textarea id="Myremarks" class="weui-textarea" placeholder="输入内容(200字内)" rows="3"
+              style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+</div>
     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
     <#if type==1>
-        <a id="buyBack" onclick="buyBack()" href="javascript:;" class="weui-btn weui-btn_default"
-           style="width: 30%;">返回</a>
+        <a onclick="buyBack()" href="javascript:;" class="weui-btn weui-btn_default"
+           style="margin-top: 0;width: 30%;">返回</a>
     <#else>
-      <a id="MybuyRepeal" onclick="MybuyBack()" href="javascript:;" class="weui-btn weui-btn_default"
-         style="width: 30%;">撤销</a>
+    <a id="MybuyRepeal" onclick="MybuyBack()" href="javascript:;" class="weui-btn weui-btn_default"
+       style="margin-top: 0;width: 30%;">撤销</a>
+    <a onclick="buyBack()" href="javascript:;" class="weui-btn weui-btn_default"
+       style="margin-top: 0;width: 30%;">返回</a>
     </#if>
         <a id="buyCommit" onclick="buyCommit()" href="javascript:;" class="weui-btn weui-btn_primary"
            style="margin-top: 0;width: 30%;">提交</a>
@@ -82,7 +86,7 @@
     <#--返回-->
     function buyBack() {
         // window.history.back();
-        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + '#tab3';
+        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + "&show=tuangou";
     }
 
     /*撤销*/
@@ -127,6 +131,8 @@
              $.alert("请填写备注");
              return;
          }*/
+        changeBuy();
+
         $.ajax({
             url: '/home/home/buyGroup',
             data: {
@@ -138,6 +144,7 @@
                 jmId: $('#jmBuy').val(),
             },
             type: 'GET',
+            async: false,
             success: function (data) {
                 console.log(data.data);
                 buyBack();
@@ -155,6 +162,7 @@
                 jmId: $('#jmBuy').val(),
             },
             type: 'GET',
+            async: false,
             success: function (data) {
                 console.log(data);
                 $("#myMenory").html($('#buyCount').val() * data.data.tgPrice)

+ 12 - 5
whepi-ui/templates/home/buytc.ftl

@@ -5,6 +5,9 @@
     <input id="buyuserId" type="text" hidden="hidden" value=${userId}>
     <input id="jmBuy" type="text" hidden="hidden" value=${jmId}>
     <input id="tgStatusBuy" type="text" hidden="hidden" value=${tgStatus}>
+<#if type==2>
+    <input id="buyIdMy2" type="text" hidden="hidden" value=${buyId}>
+</#if>
 <#-- <div style="text-align: center ">
      团购信息
  </div>-->
@@ -29,7 +32,7 @@
         </div>
     </div>
 </div>
-<#include "/home/frag.foot.ftl"/>
+    <#include "/home/frag.foot.ftl"/>
 
 <script>
     (function ($) {
@@ -57,14 +60,14 @@
                         '\n' +
                         '            <div style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;' + v.tgPrice + '</div>\n' +
                         '\n' +
-                        '            <div style="text-indent: -0em;margin-left: 2em;">最起定量(份):&nbsp;&nbsp;' + v.tgMinNum + '</div>\n' +
+                        '            <div style="text-indent: -0em;margin-left: 2em;">最起定量(份):&nbsp;&nbsp;' + v.tgMinNum + '</div>\n' +
                         '\n' +
-                        '            <div style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;' + timestampToTime(v.tgEndTime) + '</div>\n' +
+                        '            <div style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;' + v.tgEndTime + '</div>\n' +
                         '\n' +
-                        '            <div style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;' + timestampToTime(v.tgDeliverTime) + '</div>\n' +
+                        '            <div style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;' + v.tgDeliverTime + '</div>\n' +
                         '\n' +
                         '            <div style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;' + v.tgPhoneNumber + '</div>\n' +
-                        '            <div style="text-indent: -0em;margin-left: 2em;">备&nbsp;&nbsp;&nbsp;&nbsp;注:&nbsp;&nbsp;' + v.remark + '</div>\n'+
+                        '            <div style="text-indent: -0em;margin-left: 2em;">备&nbsp;&nbsp;&nbsp;&nbsp;注:&nbsp;&nbsp;' + v.remark + '</div>\n' +
                         '     </div>\n' +
                         '    </div>')
             },
@@ -78,6 +81,7 @@
          data: {
              userId: $('#buyuserId').val(),
              jmId: $('#jmBuy').val(),
+             buyId: $('#buyIdMy2').val(),
          },
          type: 'GET',
          success: function (data) {
@@ -99,6 +103,9 @@
             $('#buyCount').attr("disabled", "disabled");
             $('#myPhone').attr("disabled", "disabled");
             $('#Myremarks').attr("disabled", "disabled");
+            $('#buyCommit')[0].style.display = 'none';
+            $('#MybuyRepeal')[0].style.display = 'none';
+
         }
 
     })(jQuery);

+ 22 - 6
whepi-ui/templates/home/home.ftl

@@ -14,18 +14,18 @@
     <#--<h1>页面四</h1> </div>-->
     </div>
     <div class="weui-tabbar">
-        <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
+        <a id="jt1" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
         </a>
-        <a href="#tab2" class="weui-tabbar__item" onclick="familyClick()">
+        <a id="jt2" href="#tab2" class="weui-tabbar__item" onclick="familyClick()">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <#--<a href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">-->
-            <#--<div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>-->
-            <#--<p class="weui-tabbar__label">商品团购</p>-->
-        <#--</a>-->
+        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
+            <p class="weui-tabbar__label">商品团购</p>
+        </a>
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">我</p>-->
@@ -82,6 +82,22 @@
                 }
             });
         });
+
+
+        function selectTab() {
+            $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#jt1").removeClass('weui-bar__item--on');
+            $("#tab3").addClass('weui-tab__bd-item--active');
+            $("#jt3").addClass('weui-bar__item--on');
+            buyGroup();
+        }
+
+        var show = ${show!'"-"'};
+
+        if (show == 'tuangou') {
+            selectTab();
+
+        }
     })(jQuery);
 
 

+ 0 - 2
whepi-web/src/main/java/com/bofeng/dao/BuyMapper.java

@@ -19,8 +19,6 @@ public interface BuyMapper extends BaseMapper<Buy> {
 
   List<Buy> MyGroup(@Param("userId") Long userId);
 
-  Buy queryGroup(@Param("userId") Long userId, @Param("jmId") Long jmId);
-
   JmTuangou selectGroup(@Param("userId") Long userId, @Param("jmId") Long jmId);
 
   Buy status(@Param("jmId") Long jmId);

+ 2 - 2
whepi-web/src/main/java/com/bofeng/service/BuyService.java

@@ -41,8 +41,8 @@ public class BuyService {
     return buyMapper.MyGroup(userId);
   }
 
-  public Buy queryGroup(Long userId, Long jmId) {
-    return buyMapper.queryGroup(userId, jmId);
+  public Buy queryGroup(Long buyId) {
+    return buyMapper.selectById(buyId);
   }
 
 

+ 5 - 3
whepi-web/src/main/java/com/bofeng/wx/controller/BuyController.java

@@ -28,11 +28,13 @@ public class BuyController {
 
   @GetMapping("/home/buytc.html")
   public ModelAndView buytc(@Pd(name = "userId") Long userId, @Pd(name = "jmId") Long jmId,
-                            @Pd(name = "type") Integer type, @Pd(name = "tgStatus") Integer tgStatus, ModelMap model) {
+                            @Pd(name = "type") Integer type, @Pd(name = "tgStatus") Integer tgStatus,
+                            @Pd(name = "buyId") Long buyId, ModelMap model) {
     model.put("userId", userId);
     model.put("jmId", jmId);
     model.put("type", type);
     model.put("tgStatus", tgStatus);
+    model.put("buyId", buyId);
     return new ModelAndView("/home/buytc.ftl", model);
   }
 
@@ -48,8 +50,8 @@ public class BuyController {
 
 
   @GetMapping("/home/queryGroup/buyGroup")
-  public Model<Buy> queryGroup(@Pd(name = "userId") Long userId, @Pd(name = "jmId") Long jmId) {
-    return Model.newSuccess(buyService.queryGroup(userId, jmId));
+  public Model<Buy> queryGroup(@Pd(name = "buyId") Long buyId) {
+    return Model.newSuccess(buyService.queryGroup(buyId));
   }
 
   @GetMapping("/home/querysj/buytj")

+ 157 - 156
whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -30,164 +30,165 @@ import java.util.List;
 @RestController
 public class UserOpenController {
 
-    @Autowired
-    private HomeService homeService;
-    @Autowired
-    private UserOpenService userOpenService;
-    @Autowired
-    private UserOpenMapper userOpenMapper;
-    @Autowired
-    private UptownMapper uptownMapper;
-    @Autowired
-    private UptownHouseMapper uptownHouseMapper;
-    @Autowired
-    private UptownHomeMapper uptownHomeMapper;
-    @Autowired
-    private UserRoleMapper userRoleMapper;
-    @Autowired
-    private UptownUnitMapper uptownUnitMapper;
-    @Autowired
-    private QzTaskService qzTaskService;
-    @Autowired
-    private RbService rbService;
-    @Autowired
-    private MsReportService msReportService;
-    @Autowired
-    private RbMapper rbMapper;
-
-    @ApiOperation("登陆首页")
-    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
-            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
-    })
-    @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
-                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
-        List<UserRole> list = new ArrayList<>();
-        if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
-            userId = userOpen.getUserId();
-            model.put("user", userOpen);
-            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
-
-            List<Uptown> uptowns = rbMapper.selectUptown(userId);
-            if (uptowns != null && uptowns.size() > 0) {
-                Long uptown_id = uptowns.get(0).getUptownId();
-                String uptown_name = uptowns.get(0).getUptownName();
-                model.put("uptown_id", "\"" + uptown_id + "\"");
-                model.put("uptown_name", uptown_name);
-            }
-
-
-            if (list.size() == 0) {
-                return new ModelAndView("/user/home.ftl", model);
-            }
-            if (list.size() == 1) {
-                MsReport msReport = msReportService.getReportByDateNow(userId);
-                model.put("msReport", new JsonWapper(msReport));
-                return new ModelAndView("/home/home.ftl", model);
-            }
-            if (list.size() == 2) {
-                return new ModelAndView("/user/changeRole.ftl", model);
-            }
-        } else {
-            model.put("user", userOpenMapper.selectByUserId(userId));
-            model.put("user_id", "\"" + userId + "\"");
-            if (userType == 1) {
-                MsReport msReport = msReportService.getReportByDateNow(userId);
-                model.put("msReport", new JsonWapper(msReport));
-                return new ModelAndView("/home/home.ftl", model);
-            } else if (userType == 2) {
-                return new ModelAndView("/user/changeRole.ftl", model);
-            }
-        }
-        return null;
+  @Autowired
+  private HomeService homeService;
+  @Autowired
+  private UserOpenService userOpenService;
+  @Autowired
+  private UserOpenMapper userOpenMapper;
+  @Autowired
+  private UptownMapper uptownMapper;
+  @Autowired
+  private UptownHouseMapper uptownHouseMapper;
+  @Autowired
+  private UptownHomeMapper uptownHomeMapper;
+  @Autowired
+  private UserRoleMapper userRoleMapper;
+  @Autowired
+  private UptownUnitMapper uptownUnitMapper;
+  @Autowired
+  private QzTaskService qzTaskService;
+  @Autowired
+  private RbService rbService;
+  @Autowired
+  private MsReportService msReportService;
+  @Autowired
+  private RbMapper rbMapper;
+
+  @ApiOperation("登陆首页")
+  @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
+    @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
+  })
+  @GetMapping("/user/home.html")
+  public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                           @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
+    List<UserRole> list = new ArrayList<>();
+    if (userId == 0) {
+     /* UserOpen userOpen = homeService.getUserOpen();
+      list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());*/
+            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+      userId = userOpen.getUserId();
+      model.put("user", userOpen);
+      model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+
+      List<Uptown> uptowns = rbMapper.selectUptown(userId);
+      if (uptowns != null && uptowns.size() > 0) {
+        Long uptown_id = uptowns.get(0).getUptownId();
+        String uptown_name = uptowns.get(0).getUptownName();
+        model.put("uptown_id", "\"" + uptown_id + "\"");
+        model.put("uptown_name", uptown_name);
+      }
+
+
+      if (list.size() == 0) {
+        return new ModelAndView("/user/home.ftl", model);
+      }
+      if (list.size() == 1) {
+        MsReport msReport = msReportService.getReportByDateNow(userId);
+        model.put("msReport", new JsonWapper(msReport));
+        return new ModelAndView("/home/home.ftl", model);
+      }
+      if (list.size() == 2) {
+        return new ModelAndView("/user/changeRole.ftl", model);
+      }
+    } else {
+      model.put("user", userOpenMapper.selectByUserId(userId));
+      model.put("user_id", "\"" + userId + "\"");
+      if (userType == 1) {
+        MsReport msReport = msReportService.getReportByDateNow(userId);
+        model.put("msReport", new JsonWapper(msReport));
+        return new ModelAndView("/home/home.ftl", model);
+      } else if (userType == 2) {
+        return new ModelAndView("/user/changeRole.ftl", model);
+      }
     }
-
-    @GetMapping("/user/homeIndex.html")
-    public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
-                                  @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
-        if (userId != 0 && userType != 0) {
-            model.put("user_id", "\"" + userId + "\"");
-            List<Uptown> uptowns = rbMapper.selectUptown(userId);
-            if (uptowns != null && uptowns.size() > 0) {
-                Long uptown_id = uptowns.get(0).getUptownId();
-                String uptown_name = uptowns.get(0).getUptownName();
-                model.put("uptown_id", "\"" + uptown_id + "\"");
-                model.put("uptown_name", uptown_name);
-            }
-            if (userType == 1) {
-                MsReport msReport = msReportService.getReportByDateNow(userId);
-                model.put("msReport", new JsonWapper(msReport));
-                return new ModelAndView("/home/home.ftl", model);
-            } else if (userType == 2) {
-                List<QzTask> taskList = qzTaskService.selectAll(userId);
-                model.put("taskList", YvanUtil.toJsonPretty(taskList));
-                List<sysUptownUnit> rbList = rbService.selectAll(userId);
-                model.put("rbList", YvanUtil.toJsonPretty(rbList));
-
-                return new ModelAndView("/yeweihui/home.ftl", model);
-            }
-        }
-        return null;
-    }
-
-    @GetMapping("/home/getUptownData.json")
-    public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
-        return uptownMapper.getAllUptown(area);
+    return null;
+  }
+
+  @GetMapping("/user/homeIndex.html")
+  public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                                @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType, @RequestParam(value = "show", required = false, defaultValue = "-") String show) throws JsonProcessingException {
+    if (userId != 0 && userType != 0) {
+      model.put("user_id", "\"" + userId + "\"");
+      List<Uptown> uptowns = rbMapper.selectUptown(userId);
+      if (uptowns != null && uptowns.size() > 0) {
+        Long uptown_id = uptowns.get(0).getUptownId();
+        String uptown_name = uptowns.get(0).getUptownName();
+        model.put("uptown_id", "\"" + uptown_id + "\"");
+        model.put("uptown_name", uptown_name);
+      }
+      if (userType == 1) {
+        MsReport msReport = msReportService.getReportByDateNow(userId);
+        model.put("msReport", new JsonWapper(msReport));
+        model.put("show", "\"" + show + "\"");
+        return new ModelAndView("/home/home.ftl", model);
+      } else if (userType == 2) {
+        List<QzTask> taskList = qzTaskService.selectAll(userId);
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+        List<sysUptownUnit> rbList = rbService.selectAll(userId);
+        model.put("rbList", YvanUtil.toJsonPretty(rbList));
+
+        return new ModelAndView("/yeweihui/home.ftl", model);
+      }
     }
-
-    @GetMapping("/home/getUptownUnitData.json")
-    public List<UptownUnit> getUptownUnitData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
-        return uptownUnitMapper.getUptownUnitData(uptownId);
+    return null;
+  }
+
+  @GetMapping("/home/getUptownData.json")
+  public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
+    return uptownMapper.getAllUptown(area);
+  }
+
+  @GetMapping("/home/getUptownUnitData.json")
+  public List<UptownUnit> getUptownUnitData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
+    return uptownUnitMapper.getUptownUnitData(uptownId);
+  }
+
+  @PostMapping("/home/checkHouseId.json")
+  public ResultModel checkHouseId(HttpServletRequest request) {
+    ResultModel resultModel = new ResultModel();
+    Long unitId = Long.parseLong(request.getParameter("unitId"));
+    String doorplate = request.getParameter("doorplate");
+    List<UptownHouse> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
+    if (list.size() > 0) {
+      resultModel.put("success", false);
+      resultModel.put("msg", "该门牌已有人入住!");
+      return resultModel;
     }
-
-    @PostMapping("/home/checkHouseId.json")
-    public ResultModel checkHouseId(HttpServletRequest request) {
-        ResultModel resultModel = new ResultModel();
-        Long unitId = Long.parseLong(request.getParameter("unitId"));
-        String doorplate = request.getParameter("doorplate");
-        List<UptownHouse> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
-        if (list.size() > 0) {
-            resultModel.put("success", false);
-            resultModel.put("msg", "该门牌已有人入住!");
-            return resultModel;
-        }
-        resultModel.put("success", true);
-        resultModel.put("msg", "操作成功");
-        return resultModel;
-    }
-
-    @PostMapping("/home/saveUser.json")
-    public void saveUser(ModelMap model, HttpServletRequest request) {
-        Long userId = Long.parseLong(request.getParameter("userId"));
+    resultModel.put("success", true);
+    resultModel.put("msg", "操作成功");
+    return resultModel;
+  }
+
+  @PostMapping("/home/saveUser.json")
+  public void saveUser(ModelMap model, HttpServletRequest request) {
+    Long userId = Long.parseLong(request.getParameter("userId"));
 //        Integer userType = Integer.parseInt(request.getParameter("userType"));
-        String linkman = request.getParameter("linkman");
-        String phone = request.getParameter("phone");
-        Integer area = Integer.parseInt(request.getParameter("area"));
-        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
-        Long unitId = Long.parseLong(request.getParameter("unitId"));
-        String doorplate = request.getParameter("doorplate");
-        userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
-    }
-
-    @ApiOperation("客户档案信息错误数据导出")
-    @GetMapping("/user/importExcelUserOpen")
-    @SneakyThrows
-    public void errorCustInfo(HttpServletResponse resp) {
-        List<UserOpen> list = userOpenMapper.getAllUser();
-        ExcelUtils.writeSheet(UserOpen.class, list).export(resp, "errorCust");
-    }
-
-    @GetMapping("/home/desc.html")
-    public ModelAndView descHome(ModelMap model) {
-        return new ModelAndView("/home/desc.ftl", model);
-    }
-
-    @GetMapping("/home/homeHelp.html")
-    public ModelAndView homeHelp(ModelMap model) {
-        return new ModelAndView("/home/homeHelp.ftl", model);
-    }
+    String linkman = request.getParameter("linkman");
+    String phone = request.getParameter("phone");
+    Integer area = Integer.parseInt(request.getParameter("area"));
+    Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+    Long unitId = Long.parseLong(request.getParameter("unitId"));
+    String doorplate = request.getParameter("doorplate");
+    userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
+  }
+
+  @ApiOperation("客户档案信息错误数据导出")
+  @GetMapping("/user/importExcelUserOpen")
+  @SneakyThrows
+  public void errorCustInfo(HttpServletResponse resp) {
+    List<UserOpen> list = userOpenMapper.getAllUser();
+    ExcelUtils.writeSheet(UserOpen.class, list).export(resp, "errorCust");
+  }
+
+  @GetMapping("/home/desc.html")
+  public ModelAndView descHome(ModelMap model) {
+    return new ModelAndView("/home/desc.ftl", model);
+  }
+
+  @GetMapping("/home/homeHelp.html")
+  public ModelAndView homeHelp(ModelMap model) {
+    return new ModelAndView("/home/homeHelp.ftl", model);
+  }
 }

+ 2 - 5
whepi-web/src/main/resources/mapper/BuyMapper.xml

@@ -19,17 +19,14 @@
     </select>
 
     <select id="MyGroup" resultType="com.bofeng.entity.Buy">
-        select DISTINCT a.tg_title,b.time_create,a.tg_status,a.jm_id,b.buy_status
+        select DISTINCT a.tg_title,b.time_create,a.tg_status,a.jm_id,b.buy_status,b.buy_id
         from  jm_tuangou a
         INNER JOIN jm_buy b on a.jm_id=b.jm_id
         where b.user_id=#{userId} and buy_status=1
+        order by b.time_create desc
     </select>
 
 
-    <select id="queryGroup" resultType="com.bofeng.entity.Buy">
-        select * from jm_buy where user_id=#{userId} and jm_id=#{jmId} limit 1
-    </select>
-
     <select id="selectGroup" resultType="com.bofeng.entity.JmTuangou">
         select * from jm_tuangou where jm_id=#{jmId} limit 1
     </select>