Shanks hace 7 años
padre
commit
7c5fc404e5

+ 9 - 4
src/main/java/com/ygj/yuemum/controller/order/OrderTempController.java

@@ -40,14 +40,19 @@ public class OrderTempController {
         return orderTempService.addOrderTemp(orderTemp);
     }
 
-    @GetMapping("/deleteOrderTemp/{id}")
-    public int delete(@PathVariable("id") Integer id) {
+    @PostMapping("/updateOrderTemp")
+    public int updateOrderTemp(@ModelAttribute OrderTemp orderTemp) {
+        return orderTempService.updateOrderTemp(orderTemp);
+    }
+
+    @GetMapping("/deleteOrderTemp")
+    public int delete(@RequestParam("id") Integer id) {
         return orderTempService.deleteOrderTemp(id);
     }
 
 
-    @GetMapping("/getOrderTemp/{id}")
-    public OrderTemp getOne(@PathVariable("id") Integer id) {
+    @GetMapping("/getOrderTemp")
+    public OrderTemp getOne(@RequestParam("id") Integer id) {
         return orderTempService.getOrderTemp(id);
     }
 }

+ 1 - 0
src/main/java/com/ygj/yuemum/dao/maternitymatron/JlServiceUserDao.java

@@ -15,6 +15,7 @@ public interface JlServiceUserDao {
      * @return List<Photo>
      */
     List<JlServiceUser> getAll();
+    List<JlServiceUser> getOrdermm();
 
     List<JlServiceUser> getMMList();
 

+ 2 - 0
src/main/java/com/ygj/yuemum/dao/order/OrderTempDao.java

@@ -22,6 +22,8 @@ public interface OrderTempDao {
 
     int checkOrder(String cm_phone);
 
+    int updateByPrimaryKeySelective(OrderTemp record);
+
 
 
 }

+ 9 - 0
src/main/java/com/ygj/yuemum/domain/maternitymatron/MmStock.java

@@ -7,6 +7,15 @@ public class MmStock {
     private Integer stock_status; // 库存状态
     private String start_date; // 开始日期
     private String end_date; // 结束日期
+    private String orderno;
+
+    public String getOrderno() {
+        return orderno;
+    }
+
+    public void setOrderno(String orderno) {
+        this.orderno = orderno;
+    }
 
     public MmStock() {
         super();

+ 1 - 1
src/main/java/com/ygj/yuemum/service/maternitymatron/JlServiceUserService.java

@@ -28,7 +28,7 @@ public class JlServiceUserService {
 
 
     public List<JlServiceUser> getJlServiceUsers() {
-        List<JlServiceUser> jlServiceUsers = jlServiceUserDao.getAll();
+        List<JlServiceUser> jlServiceUsers = jlServiceUserDao.getOrdermm();
         return jlServiceUsers;
     }
 

+ 24 - 1
src/main/java/com/ygj/yuemum/service/order/OrderTempService.java

@@ -1,7 +1,9 @@
 package com.ygj.yuemum.service.order;
 
 import com.github.pagehelper.PageHelper;
+import com.ygj.yuemum.dao.maternitymatron.MmStockDao;
 import com.ygj.yuemum.dao.order.OrderTempDao;
+import com.ygj.yuemum.domain.maternitymatron.MmStock;
 import com.ygj.yuemum.domain.order.OrderTemp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,9 @@ public class OrderTempService {
     @Autowired
     private OrderTempDao orderTempDao;
 
+    @Autowired
+    private MmStockDao mmStockDao;
+
     //分页
     public Map<String, Object> getOrderTemps(int page, int limit) {
         PageHelper.startPage(page, limit);
@@ -48,7 +53,20 @@ public class OrderTempService {
         SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMdd");
         Date date = new Date();
         orderTemp.setOt_code("ON"+dateFormat.format(date)+(int)((Math.random()*9+1)*10000));
-        return orderTempDao.insertSelective(orderTemp);
+        try {
+            MmStock mmStock = new MmStock();
+            mmStock.setServant_code(Integer.parseInt(orderTemp.getJl_mmid()));
+            mmStock.setStart_date(orderTemp.getOt_startdate());
+            mmStock.setEnd_date(orderTemp.getOt_enddate());
+            mmStock.setOrderno(orderTemp.getOt_code());
+            mmStockDao.insertSelective(mmStock);
+            orderTempDao.insertSelective(orderTemp);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+
+        return 1;
     }
 
 
@@ -64,4 +82,9 @@ public class OrderTempService {
         return orderTempDao.checkOrder(phone);
     }
 
+
+    public int updateOrderTemp(OrderTemp orderTemp) {
+        return orderTempDao.updateByPrimaryKeySelective(orderTemp);
+    }
+
 }

+ 9 - 0
src/main/resources/mybatis/mapper/maternitymatron/JlServiceUserMapper.xml

@@ -507,6 +507,15 @@
         from jl_service_user
     </select>
 
+
+    <select id="getOrdermm" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from jl_service_user
+        where status = '1'
+    </select>
+
+
     <select id="saltcheck" resultType="java.lang.Integer" parameterType="java.lang.String">
         select
         count(1)

+ 9 - 2
src/main/resources/mybatis/mapper/maternitymatron/MmStockMapper.xml

@@ -8,6 +8,7 @@
         <result column="stock_status" property="stock_status" jdbcType="INTEGER" />
         <result column="start_date" property="start_date" jdbcType="VARCHAR" />
         <result column="end_date" property="end_date" jdbcType="VARCHAR" />
+        <result column="orderno" property="orderno" jdbcType="VARCHAR" />
         <result column="adminuser" property="adminuser" jdbcType="VARCHAR" />
     </resultMap>
 
@@ -89,7 +90,10 @@
                 start_date,
             </if>
             <if test="end_date != null" >
-                end_date
+                end_date,
+            </if>
+            <if test="orderno != null" >
+                orderno
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -103,7 +107,10 @@
                 #{start_date,jdbcType=DATE},
             </if>
             <if test="end_date != null" >
-                #{end_date,jdbcType=DATE}
+                #{end_date,jdbcType=DATE},
+            </if>
+            <if test="orderno != null" >
+                #{orderno,jdbcType=VARCHAR}
             </if>
         </trim>
     </insert>

+ 31 - 4
src/main/resources/mybatis/mapper/order/OrderTemp.xml

@@ -52,7 +52,7 @@
         from order_temp
         where 1=1
         <if test="ot_code != null and ot_code != ''">
-            and ot_code = #{ot_code,jdbcType=VARCHAR}
+            and ot_code like "%"#{ot_code,jdbcType=VARCHAR}"%"
         </if>
         <if test="cm_phone != null and cm_phone != ''">
             and cm_phone = #{cm_phone,jdbcType=VARCHAR}
@@ -72,6 +72,7 @@
         <if test="cityid != null and cityid != ''">
             and cityid = #{cityid,jdbcType=VARCHAR}
         </if>
+        order by id desc
     </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -81,9 +82,9 @@
         where id = #{id,jdbcType=INTEGER}
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-        delete from modoo_log
-        where cb_code = #{cb_code,jdbcType=VARCHAR}
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from order_temp
+        where id = #{id,jdbcType=VARCHAR}
     </delete>
 
     <!-- 插入一条培训信息 -->
@@ -137,4 +138,30 @@
         </trim>
     </insert>
 
+    <!-- 根据id更新一条培训信息 -->
+    <update id="updateByPrimaryKeySelective" parameterType="com.ygj.yuemum.domain.order.OrderTemp" >
+        update order_temp
+        <set >
+            <if test="cm_phone != null" >
+                cm_phone = #{cm_phone,jdbcType=VARCHAR},
+            </if>
+            <if test="ot_startdate != null" >
+                ot_startdate = #{ot_startdate,jdbcType=VARCHAR},
+            </if>
+            <if test="ot_enddate != null" >
+                ot_enddate = #{ot_enddate,jdbcType=VARCHAR},
+            </if>
+            <if test="jl_mmid != null" >
+                jl_mmid = #{jl_mmid,jdbcType=VARCHAR},
+            </if>
+            <if test="packageid != null" >
+                packageid = #{packageid,jdbcType=VARCHAR},
+            </if>
+            <if test="cityid != null" >
+                cityid = #{cityid,jdbcType=VARCHAR}
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
 </mapper>