修复下单端系统派单

CatmDogd-Mall-Front-test/.env.development

@@ -6,9 +6,9 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 
 # 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
 # VUE_APP_BASE_API = 'https://api.catmdogd.com'
-# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/'
+VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/'
 # VUE_APP_BASE_API = 'http://h5.xzaiyp.top'
-VUE_APP_BASE_API = 'http://localhost:8002'
+# VUE_APP_BASE_API = 'http://localhost:8002'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue

@@ -230,15 +230,19 @@
                 <el-form-item label="订单标识" prop="orderId">
                     <el-input v-model="form.orderId" placeholder="请输入订单标识" />
                 </el-form-item>
+
                 <el-form-item label="指定伴宠师" prop="userIdJson" v-if="form.type == 1">
-                    <el-select v-model="form.userIdJson" placeholder="请选择指定伴宠师" multiple>
+                    <el-select v-model="form.userIdJson" placeholder="请选择指定伴宠师" 
+                    key="userIdJson"
+                    multiple filterable>
                         <el-option v-for="item in getAppUsersUserBcs" :key="item.userId"
                             :label="item.userName + '(' + item.userTelephone + ')'" :value="item.userId">
                         </el-option>
                     </el-select>
                 </el-form-item>
+
                 <el-form-item label="伴宠师等级" prop="companionLevel" v-if="form.type == 0">
-                    <el-select v-model="form.companionLevel" placeholder="请选择伴宠师等级">
+                    <el-select v-model="form.companionLevel" placeholder="请选择伴宠师等级" key="companionLevel">
                         <el-option label="无" :value="0" />
                         <el-option label="初级伴宠师" :value="1" />
                         <el-option label="高级伴宠师" :value="2" />
@@ -347,7 +351,6 @@ export default {
 
                 companionLevel: [
                     { required: true, message: "伴宠师等级不能为空", trigger: "blur" },
-                    { min: 1, max: 2, message: "伴宠师等级只能为初级或高级", trigger: "blur" }
                 ],
 
                 userIdJson: [

CatmDogd-Mall-Front-test/src/views/model/AppletQuestion/index.vue

@@ -6,10 +6,10 @@
                 <el-input v-model="queryParams.title" placeholder="请输入题目标题" clearable size="small"
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="题目类型" prop="type">
+            <!-- <el-form-item label="题目类型" prop="type">
                 <el-select v-model="queryParams.type" placeholder="请选择题目类型" clearable size="small">
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="排序编号" prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入排序编号" clearable size="small"
                     @keyup.enter.native="handleQuery" />
@@ -83,12 +83,12 @@
                 <el-form-item label="排序编号" prop="orderNo">
                     <el-input v-model="form.orderNo" placeholder="请输入排序编号" />
                 </el-form-item>
-                <el-form-item label="题目类型" prop="type">
+                <!-- <el-form-item label="题目类型" prop="type">
                     <el-select v-model="form.type" placeholder="请选择题目类型" @change="handleTypeChange">
                         <el-option v-for="dict in dict.type.tm_type" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
 
                 <!-- 填空题配置 -->
                 <template v-if="form.type === '培训'">
@@ -212,6 +212,11 @@ export default {
         };
     },
     created() {
+        if(this.$route.path.includes('AppletQuestion2')){
+            this.queryParams.type = '基本';
+        }else{
+            this.queryParams.type = '培训';
+        }
         this.getList();
     },
     methods: {
@@ -268,6 +273,7 @@ export default {
         handleAdd() {
             this.reset();
             this.open = true;
+            this.form.type = this.queryParams.type;
             this.title = "添加考核题库";
         },
         /** 修改按钮操作 */

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java

@@ -69,6 +69,9 @@ public class ApiMallUserTeacherController extends BaseController {
         startPage();
         AppUsers appUsers = new AppUsers();
         appUsers.setUserBcs(1);
+
+
+
         //如果伴宠师等级传入
         if (request.getTeacherLevels() != null) {
             appUsers.setUserBcsRole(request.getTeacherLevels());
@@ -229,10 +232,10 @@ public class ApiMallUserTeacherController extends BaseController {
                     }
 
                 }
+            }else {
+                appUsersListNew.add(appUsersList.get(0));
             }
 
-
-
         }
         return getDataTable(appUsersListNew);
     }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java

@@ -99,7 +99,7 @@ public class AppletOrder {
 
     /** 超时未接单，通知次数 -1通知了管理员 其他通知次数 */
     @Excel(name = "超时未接单，通知次数")
-    private Integer noticeSystemFlag;
+    private Long noticeSystemFlag;
 
 
     //订单接单时间

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java

@@ -89,7 +89,7 @@ public class AppletOrderServiceImpl extends ServiceImpl<AppletOrderMapper, Apple
     public int insertAppletOrder(AppletOrder appletOrder)
     {
 //        appletOrder.setCreateTime(new Date());
-        appletOrder.setNoticeSystemFlag(0);
+        appletOrder.setNoticeSystemFlag(0L);
         appletOrder.setNum(1);
         int i = appletOrderMapper.insert(appletOrder);
         noticePersonalByOrderIds(Collections.singletonList(appletOrder.getId()));
@@ -112,7 +112,7 @@ public class AppletOrderServiceImpl extends ServiceImpl<AppletOrderMapper, Apple
                 .one();
 
         appletOrder.setNewOrderTime(LocalDateTime.now());
-        appletOrder.setNoticeSystemFlag(0);
+        appletOrder.setNoticeSystemFlag(0L);
         appletOrder.setNum(one.getNum() == null ? 2 : one.getNum() + 1);
 
         noticePersonalByOrderIds(Collections.singletonList(appletOrder.getId()));

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java

@@ -108,7 +108,15 @@ public class AppletUsersTeacherServiceImpl extends ServiceImpl<AppletUsersTeache
             appletUsersTeacher.setExamNumber(0);
         }
 
-        return appletUsersTeacherMapper.insertAppletUsersTeacher(appletUsersTeacher);
+        int i = 0;
+
+        try {
+            i = appletUsersTeacherMapper.insertAppletUsersTeacher(appletUsersTeacher);
+        }catch (Exception e){
+            i = appletUsersTeacherMapper.insert(appletUsersTeacher);
+        }
+
+        return i;
     }
 
     /**

ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml

@@ -101,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userBrief != null">user_brief,</if>
             <if test="thumbsUp != null">thumbs_up,</if>
             <if test="reason != null">reason,</if>
+            <if test="examNumber != null">exam_number,</if>
+            <if test="examTime != null">exam_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -124,12 +126,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="age != null">#{age},</if>
             <if test="license != null">#{license},</if>
-            <if test="userBrief != null">user_brief,</if>
-            <if test="thumbsUp != null">thumbs_up,</if>
-            <if test="reason != null">reason,</if>
-            <if test="reason != null">reason,</if>
-            <if test="examNumber != null">exam_number,</if>
-            <if test="examTime != null">exam_time,</if>
+            <if test="userBrief != null">#{userBrief},</if>
+            <if test="thumbsUp != null">#{thumbsUp},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="examNumber != null">#{examNumber},</if>
+            <if test="examTime != null">#{examTime},</if>
         </trim>
     </insert>
 

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java

@@ -164,6 +164,8 @@ public class OrderItemService extends ServiceImpl<OrderItemMapper, OrderItem> {
             Sku sku = skuService.selectById(item.getSkuId());
             ProductVO product = productService.selectById(sku.getProductId());
 
+            //TODO 这里缺失是否是主商品字段添加
+
             OrderItem orderItem = new OrderItem();
             orderItem.setId(IDGenerator.generateId());
             orderItem.setOrderId(orderId);