From e21119007e7d9899376c0dce4ed406a4c2901310 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 12 五月 2025 16:34:05 +0800
Subject: [PATCH] fix:新增订单-车牌号关联表。修复bug
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbVehicleOrder.java | 24 ++++
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java | 26 ++++
ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml | 10 +
ruoyi-ui/src/views/system/clientApp/index.vue | 10 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbVehicleOrderServiceImpl.java | 65 ++++++++++
ruoyi-admin/src/main/resources/application.yml | 1
ruoyi-system/src/main/resources/mapper/system/TbVehicleOrderMapper.xml | 69 +++++++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 40 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbVehicleOrderMapper.java | 39 ++++++
ruoyi-admin/src/main/resources/logback.xml | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java | 9 +
ruoyi-system/src/main/java/com/ruoyi/system/service/ITbVehicleOrderService.java | 39 ++++++
13 files changed, 329 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 9923bc5..d08fc1c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -132,6 +132,8 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
+ model.setOrderClass(scApp.getOrderClass()); // 璁剧疆姘戣埅瀛楀吀orderClass
+ model.setUserID(scApp.getUserId()); // 璁剧疆姘戣埅鍒嗗叕鍙窱d
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 04eb1ad..ae08b40 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -144,4 +144,3 @@
# 姘戣埅鎺ュ彛鍦板潃
min:
apiUrl: http://120.25.98.119:8084/v1/ #娴嬭瘯鐜锛歭ocalhost:8011
- appId: appId1
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index a360583..a8c526e 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/home/ruoyi/logs" />
+ <property name="log.path" value="./logs" />
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
index b7bceb2..a4ab2fe 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderAppVo.java
@@ -127,6 +127,15 @@
* 鏃堕棿鎴�
*/
private Long unixTime;
+
+ /**
+ * 姘戣埅瀛楀吀orderClass
+ */
+ private String orderClass;
+ /**
+ * 姘戣埅鍒嗗叕鍙窱d
+ */
+ private Long userID;
/**
* 绛惧悕锛岃瑙佺鍚嶇敓鎴愮畻娉�
*/
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 97cf811..c94dfb6 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -25,6 +25,8 @@
public class RyTask
{
private static final Logger log = LoggerFactory.getLogger(RyTask.class);
+
+
// 娣诲姞鐘舵�佹槧灏勫瓧鍏�
private static final Map<String, String> ORDER_STATUS_MAP = new HashMap<String, String>() {{
@@ -62,6 +64,9 @@
@Autowired
private ITbCallbackLogService tbCallbackLogService;
+
+ @Autowired
+ private ITbVehicleOrderService tbVehicleOrderService;
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
@@ -132,6 +137,38 @@
}
}
}
+
+ //濡傛灉杞︾墝鍙蜂笉涓虹┖
+ if(carLicense!=null && carLicense.length()>0){
+ log.info("鏇存柊璁㈠崟-杞︾墝鍙峰叧鑱旇〃锛屻��" + tbOrders.getOrderID() + "銆戣溅鐗屽彿锛�" + carLicense);
+
+ //鏌ヨ鏄惁瀛樺湪鍏宠仈璁板綍
+ TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(tbOrders.getOrderID());
+ if(tbVehicleOrder==null){
+ //涓嶅瓨鍦ㄥ叧鑱旇褰�
+ //鍒涘缓鍏宠仈璁板綍
+ tbVehicleOrder = new TbVehicleOrder();
+ tbVehicleOrder.setOrderId(tbOrders.getOrderID());
+ tbVehicleOrder.setServiceOrdId(tbOrders.getServiceOrdID());
+ tbVehicleOrder.setVehicle(carLicense);
+ tbVehicleOrder.setStatus("0");
+ tbVehicleOrderService.insertTbVehicleOrder(tbVehicleOrder);
+ }
+ else{
+ //瀛樺湪鍏宠仈璁板綍
+ //鏇存柊鍏宠仈璁板綍
+ if(orderStatus.getMsg().contains("宸茶繑鍥�"))
+ {
+ tbVehicleOrder.setStatus("1");
+ tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
+ }
+ else if(orderStatus.getMsg().contains("鍙栨秷"))
+ {
+ tbVehicleOrder.setStatus("2");
+ tbVehicleOrderService.updateTbVehicleOrder(tbVehicleOrder);
+ }
+ }
+ }
}
}
catch (Exception e)
@@ -142,7 +179,7 @@
SysClientApp clientApp = sysClientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
if(clientApp==null){
log.error("鍥炶皟鍦板潃涓嶅瓨鍦�");
- return;
+ continue;
}
String callbackUrl = clientApp.getCallbackUrl();
@@ -161,7 +198,6 @@
map.put("plateNo",carLicense);
map.put("driverMobile",driverMobiles.toString());
map.put("driverName", driverNames.toString());
-// map.put("appId", tbOrders.getAppId());
// 绗竴娆″皾璇�
String response = sendCallback(callbackUrl, map);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java
index 4c6536b..53c8a5c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java
@@ -67,6 +67,14 @@
private String payUrl;
+ /** 璁㈠崟鍒嗙被 */
+ @Excel(name = "OrderClass")
+ private String orderClass;
+
+ /** 鐢ㄦ埛ID */
+ @Excel(name = "鐢ㄦ埛ID")
+ private Long userId;
+
public Long getAppId() {
return appId;
}
@@ -162,7 +170,23 @@
public void setMinAppSecret(String minAppSecret) {
this.minAppSecret = minAppSecret;
}
-
+
+ public String getOrderClass() {
+ return orderClass;
+ }
+
+ public void setOrderClass(String orderClass) {
+ this.orderClass = orderClass;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbVehicleOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbVehicleOrder.java
new file mode 100644
index 0000000..c4ce43f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbVehicleOrder.java
@@ -0,0 +1,24 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍琛� tb_vehicle_order
+ */
+@Data
+public class TbVehicleOrder extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 骞夸氦璁㈠崟Id */
+ private Long orderId;
+
+ /** 姘戣埅鏈嶅姟鍗旾d */
+ private String serviceOrdId;
+
+ /** 杞︾墝鍙� */
+ private String vehicle;
+
+ /** 璁㈠崟鐘舵�� */
+ private String status;
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbVehicleOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbVehicleOrderMapper.java
new file mode 100644
index 0000000..e136811
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbVehicleOrderMapper.java
@@ -0,0 +1,39 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TbVehicleOrder;
+
+/**
+ * 璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍Mapper鎺ュ彛
+ */
+public interface TbVehicleOrderMapper {
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public TbVehicleOrder selectTbVehicleOrderById(Long orderId);
+
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍鍒楄〃
+ */
+ public List<TbVehicleOrder> selectTbVehicleOrderList(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 鏂板璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int insertTbVehicleOrder(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 淇敼璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int updateTbVehicleOrder(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int deleteTbVehicleOrderById(Integer orderId);
+
+ /**
+ * 鎵归噺鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int deleteTbVehicleOrderByIds(Integer[] orderIds);
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbVehicleOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbVehicleOrderService.java
new file mode 100644
index 0000000..07311eb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbVehicleOrderService.java
@@ -0,0 +1,39 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TbVehicleOrder;
+
+/**
+ * 璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍Service鎺ュ彛
+ */
+public interface ITbVehicleOrderService {
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public TbVehicleOrder selectTbVehicleOrderById(Long orderId);
+
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍鍒楄〃
+ */
+ public List<TbVehicleOrder> selectTbVehicleOrderList(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 鏂板璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int insertTbVehicleOrder(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 淇敼璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int updateTbVehicleOrder(TbVehicleOrder tbVehicleOrder);
+
+ /**
+ * 鎵归噺鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ public int deleteTbVehicleOrderByIds(Integer[] orderIds);
+
+ /**
+ * 鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍淇℃伅
+ */
+ public int deleteTbVehicleOrderById(Integer orderId);
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbVehicleOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbVehicleOrderServiceImpl.java
new file mode 100644
index 0000000..8dddf7e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbVehicleOrderServiceImpl.java
@@ -0,0 +1,65 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TbVehicleOrderMapper;
+import com.ruoyi.system.domain.TbVehicleOrder;
+import com.ruoyi.system.service.ITbVehicleOrderService;
+
+/**
+ * 璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍Service涓氬姟灞傚鐞�
+ */
+@Service
+public class TbVehicleOrderServiceImpl implements ITbVehicleOrderService {
+ @Autowired
+ private TbVehicleOrderMapper tbVehicleOrderMapper;
+
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ @Override
+ public TbVehicleOrder selectTbVehicleOrderById(Long orderId) {
+ return tbVehicleOrderMapper.selectTbVehicleOrderById(orderId);
+ }
+
+ /**
+ * 鏌ヨ璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍鍒楄〃
+ */
+ @Override
+ public List<TbVehicleOrder> selectTbVehicleOrderList(TbVehicleOrder tbVehicleOrder) {
+ return tbVehicleOrderMapper.selectTbVehicleOrderList(tbVehicleOrder);
+ }
+
+ /**
+ * 鏂板璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ @Override
+ public int insertTbVehicleOrder(TbVehicleOrder tbVehicleOrder) {
+ return tbVehicleOrderMapper.insertTbVehicleOrder(tbVehicleOrder);
+ }
+
+ /**
+ * 淇敼璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ @Override
+ public int updateTbVehicleOrder(TbVehicleOrder tbVehicleOrder) {
+ return tbVehicleOrderMapper.updateTbVehicleOrder(tbVehicleOrder);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍
+ */
+ @Override
+ public int deleteTbVehicleOrderByIds(Integer[] orderIds) {
+ return tbVehicleOrderMapper.deleteTbVehicleOrderByIds(orderIds);
+ }
+
+ /**
+ * 鍒犻櫎璁㈠崟鍜岃溅鐗屽彿鍏宠仈璁板綍淇℃伅
+ */
+ @Override
+ public int deleteTbVehicleOrderById(Integer orderId) {
+ return tbVehicleOrderMapper.deleteTbVehicleOrderById(orderId);
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml
index b9cc0f2..5837c9d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml
@@ -22,10 +22,12 @@
<result property="minAppSecret" column="min_app_secret" />
<result property="callbackUrl" column="callback_url" />
<result property="payUrl" column="pay_url" />
+ <result property="orderClass" column="order_class" />
+ <result property="userId" column="user_id" />
</resultMap>
<sql id="selectSysClientAppVo">
- select app_id, client_name, app_key, security_key, valid_start_time, valid_end_time, status, del_flag, create_by, create_time, update_by, update_time, remark, min_app_id, min_app_secret, callback_url, pay_url from sys_client_app
+ select app_id, client_name, app_key, security_key, valid_start_time, valid_end_time, status, del_flag, create_by, create_time, update_by, update_time, remark, min_app_id, min_app_secret, callback_url, pay_url, order_class, user_id from sys_client_app
</sql>
<select id="selectSysClientAppList" parameterType="SysClientApp" resultMap="SysClientAppResult">
@@ -68,6 +70,8 @@
<if test="minAppSecret != null">min_app_secret,</if>
<if test="callbackUrl != null">callback_url,</if>
<if test="payUrl != null">pay_url,</if>
+ <if test="orderClass != null">order_class,</if>
+ <if test="userId != null">user_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="clientName != null">#{clientName},</if>
@@ -86,6 +90,8 @@
<if test="minAppSecret != null">#{minAppSecret},</if>
<if test="callbackUrl != null">#{callbackUrl},</if>
<if test="payUrl != null">#{payUrl},</if>
+ <if test="orderClass != null">#{orderClass},</if>
+ <if test="userId != null">#{userId},</if>
</trim>
</insert>
@@ -103,6 +109,8 @@
<if test="minAppSecret != null">min_app_secret = #{minAppSecret},</if>
<if test="callbackUrl != null">callback_url = #{callbackUrl},</if>
<if test="payUrl != null">pay_url = #{payUrl},</if>
+ <if test="orderClass != null">order_class = #{orderClass},</if>
+ <if test="userId != null">user_id = #{userId},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbVehicleOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbVehicleOrderMapper.xml
new file mode 100644
index 0000000..351e2b2
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TbVehicleOrderMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TbVehicleOrderMapper">
+
+ <resultMap type="TbVehicleOrder" id="TbVehicleOrderResult">
+ <result property="orderId" column="orderId" />
+ <result property="serviceOrdId" column="serviceOrdId"/>
+ <result property="vehicle" column="vehicle" />
+ <result property="status" column="status" />
+ </resultMap>
+
+ <sql id="selectTbVehicleOrderVo">
+ select orderId, serviceOrdId, vehicle, status from tb_vehicle_order
+ </sql>
+
+ <select id="selectTbVehicleOrderList" parameterType="TbVehicleOrder" resultMap="TbVehicleOrderResult">
+ <include refid="selectTbVehicleOrderVo"/>
+ <where>
+ <if test="orderId != null "> and orderId = #{orderId}</if>
+ <if test="serviceOrdId != null "> and serviceOrdId = #{serviceOrdId}</if>
+ <if test="vehicle != null and vehicle != ''"> and vehicle = #{vehicle}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ </where>
+ </select>
+
+ <select id="selectTbVehicleOrderById" parameterType="Long" resultMap="TbVehicleOrderResult">
+ <include refid="selectTbVehicleOrderVo"/>
+ where orderId = #{orderId}
+ </select>
+
+ <insert id="insertTbVehicleOrder" parameterType="TbVehicleOrder">
+ insert into tb_vehicle_order
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">orderId,</if>
+ <if test="serviceOrdId != null">serviceOrdId,</if>
+ <if test="vehicle != null">vehicle,</if>
+ <if test="status != null">status,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">#{orderId},</if>
+ <if test="serviceOrdId != null">#{serviceOrdId},</if>
+ <if test="vehicle != null">#{vehicle},</if>
+ <if test="status != null">#{status},</if>
+ </trim>
+ </insert>
+
+ <update id="updateTbVehicleOrder" parameterType="TbVehicleOrder">
+ update tb_vehicle_order
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="serviceOrdId != null">serviceOrdId = #{serviceOrdId},</if>
+ <if test="vehicle != null">vehicle = #{vehicle},</if>
+ <if test="status != null">status = #{status},</if>
+ </trim>
+ where orderId = #{orderId}
+ </update>
+
+ <delete id="deleteTbVehicleOrderById" parameterType="Integer">
+ delete from tb_vehicle_order where orderId = #{orderId}
+ </delete>
+
+ <delete id="deleteTbVehicleOrderByIds" parameterType="String">
+ delete from tb_vehicle_order where orderId in
+ <foreach item="orderId" collection="array" open="(" separator="," close=")">
+ #{orderId}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/clientApp/index.vue b/ruoyi-ui/src/views/system/clientApp/index.vue
index faea463..5f19022 100644
--- a/ruoyi-ui/src/views/system/clientApp/index.vue
+++ b/ruoyi-ui/src/views/system/clientApp/index.vue
@@ -102,10 +102,12 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="姘戣埅鍚堜綔鍏徃Id" align="center" prop="minAppId" />
+ <el-table-column label="姘戣埅鍚堜綔鍏徃AppId" align="center" prop="minAppId" />
<el-table-column label="姘戣埅鍚堜綔鍏徃瀵嗛挜" align="center" prop="minAppSecret" />
<el-table-column label="鍥炶皟鍦板潃" align="center" prop="callbackUrl" />
<el-table-column label="鏀粯鍦板潃" align="center" prop="payUrl" />
+ <el-table-column label="姘戣埅瀛楀吀orderClass" align="center" prop="orderClass" />
+ <el-table-column label="姘戣埅鍒嗗叕鍙窱d" align="center" prop="userId" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -178,6 +180,12 @@
<el-form-item label="鏀粯鍦板潃" prop="payUrl">
<el-input v-model="form.payUrl" placeholder="璇疯緭鍏ユ敮浠樺湴鍧�" />
</el-form-item>
+ <el-form-item label="姘戣埅瀛楀吀orderClass" prop="orderClass">
+ <el-input v-model="form.orderClass" placeholder="璇疯緭鍏ユ皯鑸瓧鍏竜rderClass" />
+ </el-form-item>
+ <el-form-item label="姘戣埅鍒嗗叕鍙窱d" prop="userId">
+ <el-input v-model="form.userId" placeholder="璇疯緭鍏ユ皯鑸垎鍏徃Id" />
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
--
Gitblit v1.9.1