wuheng 2 年之前
父节点
当前提交
043ff50a43

+ 15 - 0
travel/common/src/main/java/com/lc/common/pojo/OrderParams.java

@@ -0,0 +1,15 @@
+package com.lc.common.pojo;
+
+import lombok.Data;
+
+@Data
+public class OrderParams {
+
+    private Integer setmealId;
+    private String sex;
+    private String name;
+    private String telephone;
+    private Integer validateCode;
+    private String idCard;
+
+}

+ 5 - 5
travel/mbg/pom.xml

@@ -22,11 +22,11 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.5.2</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

+ 2 - 2
travel/mbg/src/main/java/com/cl/mbg/model/TAddress.java

@@ -1,7 +1,7 @@
 package com.cl.mbg.model;
 
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
+//import com.alibaba.fastjson2.annotation.JSONField;
+//import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 

+ 7 - 0
travel/service/src/main/java/com/lc/service/OrderService.java

@@ -0,0 +1,7 @@
+package com.lc.service;
+
+import com.lc.common.pojo.OrderParams;
+
+public interface OrderService {
+    int addOrderInfo(OrderParams orderParams);
+}

+ 67 - 0
travel/service/src/main/java/com/lc/service/impl/OrderServiceImpl.java

@@ -0,0 +1,67 @@
+package com.lc.service.impl;
+
+import com.cl.mbg.mapper.TMemberMapper;
+import com.cl.mbg.mapper.TOrderMapper;
+import com.cl.mbg.model.TMember;
+import com.cl.mbg.model.TMemberExample;
+import com.cl.mbg.model.TOrder;
+import com.lc.common.pojo.OrderParams;
+import com.lc.service.OrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+
+    @Resource
+    TMemberMapper memberMapper;
+
+    @Resource
+    TOrderMapper orderMapper;
+
+    @Override
+    public int addOrderInfo(OrderParams orderParams) {
+        //1 处理会员信息
+        int memberId = memberEx(orderParams);
+        if ( memberId == 0  ) {
+            memberId = addMember(orderParams);
+        }
+        //2 添加订单
+        return addOrder( orderParams, memberId );
+    }
+
+    private int addOrder(OrderParams orderParams, int memberId){
+        TOrder tOrder = new TOrder();
+        tOrder.setMemberId(memberId);
+        tOrder.setSetmealId( orderParams.getSetmealId() );
+        tOrder.setOrderdate( new Date() );
+        tOrder.setOrderstatus("未出游");
+        tOrder.setOrdertype("微信预约");
+        int i = orderMapper.insert(tOrder);
+        return i == 1 ? tOrder.getId() : 0;
+    }
+
+    //查询会员是否存在
+    private int memberEx(OrderParams orderParams){
+        TMemberExample tMemberExample = new TMemberExample();
+        TMemberExample.Criteria criteria = tMemberExample.createCriteria();
+        criteria.andIdcardEqualTo( orderParams.getIdCard() );
+        List<TMember> tMembers = memberMapper.selectByExample(tMemberExample);
+        return tMembers.size() > 0 ? tMembers.get(tMembers.size() - 1).getId() : 0;
+    }
+
+    //新增会员
+    private int addMember(OrderParams orderParams){
+        TMember tMember = new TMember();
+        tMember.setIdcard( orderParams.getIdCard() );
+        tMember.setName( orderParams.getName() );
+        tMember.setPhonenumber( orderParams.getTelephone() );
+        tMember.setSex( orderParams.getSex() );
+        tMember.setRegtime( new Date() );
+        memberMapper.insert(tMember);
+        return  tMember.getId();
+    }
+}

+ 28 - 0
travel/web/src/main/java/com/lc/web/controller/OrderController.java

@@ -0,0 +1,28 @@
+package com.lc.web.controller;
+
+import com.lc.common.pojo.OrderParams;
+import com.lc.common.utils.Result;
+import com.lc.service.OrderService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/order")
+public class OrderController {
+
+    @Resource
+    OrderService orderService;
+
+    @RequestMapping("/addOrderInfo.do")
+    public Result addOrderInfo(@RequestBody OrderParams orderParams){
+        int i = orderService.addOrderInfo(orderParams);
+        HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("id", i);
+        return Result.data(objectObjectHashMap);
+    }
+
+}

+ 16 - 0
travel/web/src/main/java/com/lc/web/controller/StaticPageController.java

@@ -20,4 +20,20 @@ public class StaticPageController {
     public String setmeal_detail(){
         return "setmeal_detail";
     }
+
+    @RequestMapping( "/pages/orderInfo.html")
+    public String orderInfo(int id){
+        return "orderInfo";
+    }
+
+    @RequestMapping( "/pages/orderNotice.html")
+    public String orderNotice(){
+        return "orderNotice";
+    }
+
+    @RequestMapping( "/pages/orderSuccess.html")
+    public String orderSuccess(){
+        return "orderSuccess";
+    }
+
 }

+ 2 - 2
travel/web/src/main/resources/templates/orderInfo.html

@@ -34,7 +34,7 @@
             <div class="contentBox">
                 <div class="card">
                     <div class="">
-                        <img :src="setmeal.img" width="100%" height="100%" />
+                        <img :src="'https://80boys-beijing.oss-cn-beijing.aliyuncs.com/'+setmeal.img" width="100%" height="100%" />
                     </div>
                     <div class="project-text">
                         <h4 class="tit">{{setmeal.name}}</h4>
@@ -91,7 +91,7 @@
                         </div>
                         <div class="date">
                             <label>空气旅游日期</label>
-                            <i class="icon-date" class="picktime"></i>
+                            <i class="icon-date picktime"></i>
                             <input v-model="orderInfo.orderDate" type="text" class="picktime" readonly>
                         </div>
                     </form>