修改供应商

src/main/java/com/supplier/controller/PrivateOrderController.java

@@ -12,10 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 私人订制
@@ -40,8 +37,14 @@ public class PrivateOrderController {
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
             privateOrder.setCode((String) userMap.get("code"));
 
-            List<PrivateOrder> list = privateOrderService.getPrivateOrder(privateOrder);
-            int count = privateOrderService.getPrivateOrderCount(privateOrder);
+            int count = 0;
+            List<PrivateOrder> list = new ArrayList<PrivateOrder>();
+            if(privateOrder.getOrderType() == 0){
+                list = privateOrderService.getPrivateOrderZeor(privateOrder);
+            } else {
+                list = privateOrderService.getPrivateOrder(privateOrder);
+            }
+
             map.put("count", count);
             map.put("data", list);
             map.put("msg", "200");

src/main/java/com/supplier/controller/SupplierReleaseController.java

@@ -41,7 +41,6 @@ public class SupplierReleaseController {
     @PostMapping("addSupplierRelease")
     public Map<String, Object> addRelease(@RequestBody SupplierRelease supplierRelease, HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
-        System.out.println(supplierRelease.getReleasePlayString());
         try {
             //获取token
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
@@ -67,6 +66,7 @@ public class SupplierReleaseController {
                 }
             }
             supplierReleaseService.addRelease(supplierRelease);
+            supplierReleaseService.addPrivateType(supplierRelease);
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();
@@ -86,9 +86,35 @@ public class SupplierReleaseController {
         Map<String, Object> map = new HashMap<>();
         try{
             //获取token
-            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
-            supplierRelease.setCode((String) userMap.get("code"));
+//            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+//            supplierRelease.setCode((String) userMap.get("code"));
+
+            List<SupplierRelease> list = supplierReleaseService.getSupplierRelease(supplierRelease);
+            for(int i = 0; i < list.size(); i++){
+                //查询每日信息
+                list.get(i).setReleaseDay(supplierReleaseService.getSupplierReleaseDay(list.get(i).getUuid()));
+                //查询游玩游戏
+                list.get(i).setReleasePlay(supplierReleaseService.getSupplierReleasePlay(list.get(i).getUuid()));
+            }
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+        }
+        return map;
+    }
 
+    /**
+     * 个人查询供应商提供的信息
+     * @param supplierRelease
+     * @param request
+     * @return
+     */
+    @GetMapping("getSupplierReleasePersonal")
+    public Map<String, Object> getSupplierReleasePersonal(SupplierRelease supplierRelease, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try{
             List<SupplierRelease> list = supplierReleaseService.getSupplierRelease(supplierRelease);
             for(int i = 0; i < list.size(); i++){
                 //查询每日信息

src/main/java/com/supplier/mapper/PrivateOrderMapper.java

@@ -15,4 +15,8 @@ public interface PrivateOrderMapper {
     void addIgnore(Ignore ignore);
 
     PrivateOrder getPrivateOrderById(String uuid);
+
+    int getPrivateOrderType(PrivateOrder privateOrder);
+
+    List<PrivateOrder> getPrivateOrderZeor(PrivateOrder privateOrder);
 }

src/main/java/com/supplier/mapper/SupplierReleaseMapper.java

@@ -26,4 +26,8 @@ public interface SupplierReleaseMapper{
     void delSupplierReleasePlay(SupplierRelease supplierRelease);
 
     void updateSupplierRelease(SupplierRelease supplierRelease);
+
+    void addPrivateType(SupplierRelease supplierRelease);
+
+    void updatePrivateType(SupplierRelease supplierRelease);
 }

src/main/java/com/supplier/model/SupplierRelease.java

@@ -87,4 +87,8 @@ public class SupplierRelease implements Serializable {
      * 供应商名称
      */
     private String name;
+    /**
+     * 状态
+     */
+    private String orderType;
 }

src/main/java/com/supplier/service/PrivateOrderService.java

@@ -14,4 +14,8 @@ public interface PrivateOrderService {
     void addIgnore(Ignore ignore);
 
     PrivateOrder getPrivateOrderById(String uuid);
+
+    int getPrivateOrderType(PrivateOrder privateOrder);
+
+    List<PrivateOrder> getPrivateOrderZeor(PrivateOrder privateOrder);
 }

src/main/java/com/supplier/service/SupplierReleaseService.java

@@ -20,4 +20,8 @@ public interface SupplierReleaseService{
     List<SupplierReleasePlay> getSupplierReleasePlay(String uuid);
 
     void updateSupplierRelease(SupplierRelease supplierRelease);
+
+    void addPrivateType(SupplierRelease supplierRelease);
+
+    void updatePrivateType(SupplierRelease supplierRelease);
 }

src/main/java/com/supplier/service/impl/PrivateOrderServiceImpl.java

@@ -36,4 +36,14 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public PrivateOrder getPrivateOrderById(String uuid) {
         return privateOrderMapper.getPrivateOrderById(uuid);
     }
+
+    @Override
+    public int getPrivateOrderType(PrivateOrder privateOrder) {
+        return privateOrderMapper.getPrivateOrderType(privateOrder);
+    }
+
+    @Override
+    public List<PrivateOrder> getPrivateOrderZeor(PrivateOrder privateOrder) {
+        return privateOrderMapper.getPrivateOrderZeor(privateOrder);
+    }
 }

src/main/java/com/supplier/service/impl/SupplierReleaseServiceImpl.java

@@ -56,4 +56,16 @@ public class SupplierReleaseServiceImpl implements SupplierReleaseService {
     public void updateSupplierRelease(SupplierRelease supplierRelease) {
         supplierReleaseMapper.updateSupplierRelease(supplierRelease);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addPrivateType(SupplierRelease supplierRelease) {
+        supplierReleaseMapper.addPrivateType(supplierRelease);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePrivateType(SupplierRelease supplierRelease) {
+        supplierReleaseMapper.updatePrivateType(supplierRelease);
+    }
 }

src/main/resources/config/mapping/SupplierReleaseMapper.xml

@@ -28,9 +28,9 @@
             <if test="uuid != null and uuid != ''">
                 and a.uuid = #{uuid}
             </if>
-<!--            <if test="code != null and code != ''">-->
-<!--                and a.code = #{code}-->
-<!--            </if>-->
+            <if test="code != null and code != ''">
+                and a.code = #{code}
+            </if>
             <if test="demandUuid != null and demandUuid != ''">
                 and a.demand_uuid = #{demandUuid}
             </if>
@@ -83,4 +83,12 @@
         </set>
         where uuid = #{uuid}
     </update>
+    <!-- 新增定制单状态 -->
+    <insert id="addPrivateType" parameterType="supplierRelease">
+        insert into bus_private_ordering_type(code,demand_uuid,order_type) values(#{code}, #{demandUuid}, 1)
+    </insert>
+    <!-- 修改指定供应商定制单状态 -->
+    <update id="updatePrivateType" parameterType="supplierRelease">
+        update bus_private_ordering_type set order_type = #{orderType} where code = #{code} and demand_uuid = #{demandUuid}
+    </update>
 </mapper>

src/main/resources/config/mapping/privateOrderMapper.xml

@@ -5,22 +5,51 @@
     <!-- 查询私人订制 -->
     <select id="getPrivateOrder" resultType="PrivateOrder">
         SELECT
-        *
+        b.*
         FROM
         ( SELECT *, ROW_NUMBER ( ) OVER ( ORDER BY ID ) AS RowId FROM bus_private_ordering ) AS b
+        JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE code = #{code} and order_type = #{orderType}) as c on b.uuid = c.demand_uuid
+        WHERE
+        RowId BETWEEN #{page} AND #{limit}
+        AND uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
+        <if test="startTime != null and startTime !=''">
+            and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
+    <!-- 查询私人订制特殊 -->
+    <select id="getPrivateOrderZeor" resultType="PrivateOrder">
+        SELECT
+            b.*
+        FROM
+        ( SELECT *, ROW_NUMBER ( ) OVER ( ORDER BY ID ) AS RowId FROM bus_private_ordering ) AS b
+        JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE order_type = 0 AND demand_uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE code = #{code} AND order_type != 0 ) ) AS c ON b.uuid = c.demand_uuid
         WHERE
         RowId BETWEEN #{page} AND #{limit}
         AND uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
-        AND order_type = #{orderType}
         <if test="startTime != null and startTime !=''">
             and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
         </if>
     </select>
     <!-- 查询总条数 -->
     <select id="getPrivateOrderCount" resultType="int">
-        select count(*) as count from bus_private_ordering where order_type = #{orderType}
+        SELECT
+            COUNT( * ) AS COUNT
+        FROM
+            bus_private_ordering
+        WHERE
+            order_type = #{ orderType}
     </select>
-    <!-- 查询总条数 -->
+    <!-- 查询总条数特殊 -->
+    <select id="getPrivateOrderCountZeor" resultType="int">
+        SELECT
+            COUNT( * ) AS COUNT
+        FROM
+            bus_private_ordering
+        JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE order_type = 0 ) AS c ON b.uuid = c.demand_uuid
+        WHERE
+            order_type = #{ orderType}
+    </select>
+    <!-- 新增忽略 -->
     <insert id="addIgnore" parameterType="Ignore">
         insert into bus_ignore_supplier(uuid,code,ordering_uuid) values (#{uuid},#{code},#{orderingUuid})
     </insert>
@@ -28,4 +57,8 @@
     <select id="getPrivateOrderById" resultType="PrivateOrder">
         select * from bus_private_ordering where uuid = #{uuid}
     </select>
+    <!-- 查询指定供应商是否填写过该定制单 -->
+    <select id="getPrivateOrderType" parameterType="PrivateOrder" resultType="int">
+        select count(*) as count from bus_private_ordering_type where code = #{code} and order_type != 0
+    </select>
 </mapper>

src/main/resources/static/js/demandForSingle/index/even.js

@@ -5,4 +5,4 @@ var laydate = null;
 var laypage = null;
 var startTime = null; //开始时间
 var endTime = null; //结束时间
-var token = "07E20E117812C34B244EA73B99A65918CAD573DFB012FC523FD3CDA2E259EA06BC98731115C4DEFFF5C1226FE6DF81058A9E695C6C9BFF9B76AD417F0197BFAE1035BC7A5F3A72D83A63C8908F50DC71694CD87D43569EC0780735CCF3CAEE9AD61AD9E960E16E3AC579537E6988ABF60F55C8F450841D1EEFCD60426F863A11285781E8DEA450B4AE0F96727599F65106ECB2C95D9352601E59C3551D80B98AAAAA71AAACC80578";
+var token = "07E20E117812C34B244EA73B99A65918CAD573DFB012FC523FD3CDA2E259EA06BC98731115C4DEFFF5C1226FE6DF81058A9E695C6C9BFF9BF5FBB7E7B96321821035BC7A5F3A72D83A63C8908F50DC71F2423C6B8589BE4D3CDE5714316AA5A7D61AD9E960E16E3A314D749FD7E91FA2973B42BE93AD177C9780E168022E7D8E09262E2F43C7060B38054CC7B5B6528EA32A51D05B2C9F1DBBE4676C13CD1F6EA455DC12032EE6C2";

src/main/resources/static/js/demandForSingle/index/function.js

@@ -103,7 +103,7 @@ function getQuotation(page, limit, startTime, endTime){
                 //自定义样式分页
                 laypage.render({
                     elem: 'demo2'
-                    ,count: data.count
+                    ,count: data.data.length
                     ,theme: '#1E9FFF'
                     , limit: limit
                     , curr: page

src/main/resources/static/js/demandForSingle/offer/even.js

@@ -10,4 +10,4 @@ var addDate = null;
 var delteDate = null;
 var titleImg = null;
 var contractFile = null;//合同
-var token = "07E20E117812C34B244EA73B99A65918CAD573DFB012FC523FD3CDA2E259EA06BC98731115C4DEFFF5C1226FE6DF81058A9E695C6C9BFF9B76AD417F0197BFAE1035BC7A5F3A72D83A63C8908F50DC71694CD87D43569EC0780735CCF3CAEE9AD61AD9E960E16E3AC579537E6988ABF60F55C8F450841D1EEFCD60426F863A11285781E8DEA450B4AE0F96727599F65106ECB2C95D9352601E59C3551D80B98AAAAA71AAACC80578";
+var token = "07E20E117812C34B244EA73B99A65918CAD573DFB012FC523FD3CDA2E259EA06BC98731115C4DEFFF5C1226FE6DF81058A9E695C6C9BFF9BF5FBB7E7B96321821035BC7A5F3A72D83A63C8908F50DC71F2423C6B8589BE4D3CDE5714316AA5A7D61AD9E960E16E3A314D749FD7E91FA2973B42BE93AD177C9780E168022E7D8E09262E2F43C7060B38054CC7B5B6528EA32A51D05B2C9F1DBBE4676C13CD1F6EA455DC12032EE6C2";

src/main/resources/static/js/demandForSingle/offer/function.js

@@ -363,13 +363,15 @@ function elementDrawing(data){
     $("textarea[name=priceDetailText]").val(data.data[0].priceDetailText);
     contractFile = data.data[0].contractFile
     titleImg = data.data[0].titleImg
-    //其他渲染
-    for(var i = 0; i < data.data[0].other.split(",").length; i++){
-        $.each($(".radio_div_select"), (index, element) => {
-            if(data.data[0].other.split(",")[i] == $(element).find("span").text()){
-                $(element).find(".radio_icon").addClass("radio_icon_color")
-            }
-        });
+    if(data.data[0].other != null){
+        //其他渲染
+        for(var i = 0; i < data.data[0].other.split(",").length; i++){
+            $.each($(".radio_div_select"), (index, element) => {
+                if(data.data[0].other.split(",")[i] == $(element).find("span").text()){
+                    $(element).find(".radio_icon").addClass("radio_icon_color")
+                }
+            });
+        }
     }
     //游玩渲染
     var uuid = guid();
@@ -734,8 +736,8 @@ function theValues(){
     });
     var releaseDayString = JSON.stringify(releaseDay);
     var releasePlayString = JSON.stringify(releasePlay);
-    map.releaseDayString = JSON.stringify(releaseDayString);
-    map.releasePlayString = JSON.stringify(releasePlayString);
+    map.releaseDayString = releaseDayString;
+    map.releasePlayString = releasePlayString;
     return map;
 }
 //保存模板

src/main/resources/static/js/personal/even.js

@@ -1,3 +1,4 @@
 var $ = null;
 var form = null;
-var layer = null;
+var layer = null;
+var token = "07E20E117812C34B244EA73B99A65918CAD573DFB012FC523FD3CDA2E259EA06BC98731115C4DEFFF5C1226FE6DF81058A9E695C6C9BFF9B76AD417F0197BFAE1035BC7A5F3A72D83A63C8908F50DC71694CD87D43569EC0780735CCF3CAEE9AD61AD9E960E16E3AC579537E6988ABF60F55C8F450841D1EEFCD60426F863A11285781E8DEA450B4AE0F96727599F65106ECB2C95D9352601E59C3551D80B98AAAAA71AAACC80578";

src/main/resources/static/js/personal/index.js

@@ -37,7 +37,6 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
                         layer.closeAll("loading");
                         layer.msg(data.errMsg, {icon: 2});
                     }
-
                 },
                 error: () => {
                     layer.closeAll("loading");
@@ -94,6 +93,35 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
     });
     //发送验证码
     $(document).on("click", ".getCode", (e) => {
-
+        let phone = $("input[name=phone]").val();//新手机号
+        let oldPhone = $("input[name=oldPhone]").val();//新手机号
+        if(!(/^1[3456789]\d{9}$/.test(oldPhone))){
+            layer.alert("手机号格式不正确", {icon: 2});
+            return false;
+        }
+        if(!(/^1[3456789]\d{9}$/.test(phone))){
+            layer.alert("手机号格式不正确", {icon: 2});
+            return false;
+        }
+        //发送验证码
+        $.ajax({
+            url: "http://116.62.173.33:3033/api/supplier/checkTele",
+            type: "get",
+            data: {
+                "phone": phone
+            },
+            // contentType: "application/json",
+            headers: {"token": token},
+            dataType: "json",
+            success: (data) => {
+               if(data.msg == "500"){
+                    layer.alert(data.errMsg, {icon: 1});
+               }
+            },
+            error: () => {
+                layer.closeAll("loading");
+                layer.alert("网络错误 请联系管理员");
+            }
+        });
     });
 });