202506101156

ruoyi-system/src/main/java/com/ruoyi/system/domain/AppleDoMain/AddressApple.java

@@ -0,0 +1,187 @@
+package com.ruoyi.system.domain.AppleDoMain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 小程序用户地址对象 AddressApple
+ * 用于小程序接口返回地址数据
+ * 
+ * @author Mr. Zhang Pan
+ * @date 2025-01-15
+ */
+public class AddressApple extends BaseEntity {
+    
+    private static final long serialVersionUID = 1L;
+
+    /** 地址ID */
+    private Long id;
+
+    /** 用户ID */
+    private Long uid;
+
+    /** 收货人姓名 */
+    private String name;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 纬度 */
+    private String latitude;
+
+    /** 经度 */
+    private String longitude;
+
+    /** 地图点选地址名称 */
+    private String address_name;
+
+    /** 地图点选地址信息 */
+    private String address_info;
+
+    /** 详细地址信息 */
+    private String info;
+
+    /** 是否默认地址 1:是 0:否 */
+    private Long is_default;
+
+    /** 创建时间 */
+    private Date created_at;
+
+    /** 更新时间 */
+    private Date updated_at;
+
+    /** 删除时间 */
+    private Date deleted_at;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUid() {
+        return uid;
+    }
+
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getAddress_name() {
+        return address_name;
+    }
+
+    public void setAddress_name(String address_name) {
+        this.address_name = address_name;
+    }
+
+    public String getAddress_info() {
+        return address_info;
+    }
+
+    public void setAddress_info(String address_info) {
+        this.address_info = address_info;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public Long getIs_default() {
+        return is_default;
+    }
+
+    public void setIs_default(Long is_default) {
+        this.is_default = is_default;
+    }
+
+    public Date getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
+
+    public Date getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(Date updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public Date getDeleted_at() {
+        return deleted_at;
+    }
+
+    public void setDeleted_at(Date deleted_at) {
+        this.deleted_at = deleted_at;
+    }
+
+    /**
+     * 从UserAddress转换为AddressApple
+     * @param userAddress 原始地址对象
+     * @return AddressApple对象
+     */
+    public static AddressApple fromUserAddress(com.ruoyi.system.domain.UserAddress userAddress) {
+        if (userAddress == null) {
+            return null;
+        }
+        
+        AddressApple addressApple = new AddressApple();
+        addressApple.setId(userAddress.getId());
+        addressApple.setUid(userAddress.getUid());
+        addressApple.setName(userAddress.getName());
+        addressApple.setPhone(userAddress.getPhone());
+        addressApple.setLatitude(userAddress.getLatitude());
+        addressApple.setLongitude(userAddress.getLongitude());
+        addressApple.setAddress_name(userAddress.getAddressName());
+        addressApple.setAddress_info(userAddress.getAddressInfo());
+        addressApple.setInfo(userAddress.getInfo());
+        addressApple.setIs_default(userAddress.getIsDefault());
+        addressApple.setCreated_at(userAddress.getCreatedAt());
+        addressApple.setUpdated_at(userAddress.getUpdatedAt());
+        addressApple.setDeleted_at(userAddress.getDeletedAt());
+        
+        return addressApple;
+    }
+} 

ruoyi-system/src/main/java/com/ruoyi/system/domain/AppleDoMain/OrderApple.java

@@ -0,0 +1,146 @@
+package com.ruoyi.system.domain.AppleDoMain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.Map;
+
+public class OrderApple  extends BaseEntity {
+
+
+    private Date created_at;//  "2024-08-31 12:04:50"
+    private Long id;//  260
+    private Integer is_comment;//  1
+    private String make_hour;//  "14:00-15:00"
+    private Integer make_time;// "2024-08-31 14:00-15:00"
+    private String name;//  "赵先生"
+    private Integer  num;//  1
+    private String order_id;//  "B831770908583777"
+    private Map<String,Object> product;//  "{}"product
+    private Long product_id;//  62
+    private String sku;//  null
+    private Long status;//  4
+    private String total_price;//  "68.00"
+    private Integer type;//  1
+    private Long uid;//  : 302
+
+    public Long getUid() {
+        return uid;
+    }
+
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getTotal_price() {
+        return total_price;
+    }
+
+    public void setTotal_price(String total_price) {
+        this.total_price = total_price;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public Long getProduct_id() {
+        return product_id;
+    }
+
+    public void setProduct_id(Long product_id) {
+        this.product_id = product_id;
+    }
+
+    public Map<String, Object> getProduct() {
+        return product;
+    }
+
+    public void setProduct(Map<String, Object> product) {
+        this.product = product;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getMake_time() {
+        return make_time;
+    }
+
+    public void setMake_time(Integer make_time) {
+        this.make_time = make_time;
+    }
+
+    public String getMake_hour() {
+        return make_hour;
+    }
+
+    public void setMake_hour(String make_hour) {
+        this.make_hour = make_hour;
+    }
+
+    public Integer getIs_comment() {
+        return is_comment;
+    }
+
+    public void setIs_comment(Integer is_comment) {
+        this.is_comment = is_comment;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.AppleDoMain.OrderApple;
 import com.ruoyi.system.domain.Order;
 
 /**
@@ -19,6 +21,16 @@ public interface OrderMapper
      */
     public Order selectOrderById(Long id);
 
+
+
+
+    /**
+     * 小程序查询服务订单列表
+     *
+     * @param orderApple 服务订单
+     * @return 服务订单集合
+     */
+    public List<OrderApple> selectOrderAppleList(OrderApple orderApple);
     /**
      * 查询服务订单列表
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.AppleDoMain.OrderApple;
 import com.ruoyi.system.domain.Order;
 
 /**
@@ -19,7 +21,13 @@ public interface IOrderService
      */
     public Order selectOrderById(Long id);
 
-
+    /**
+     * 小程序查询服务订单列表
+     *
+     * @param orderApple 服务订单
+     * @return 服务订单集合
+     */
+    public List<OrderApple> selectOrderAppleList(OrderApple orderApple);
 
     public Order selectOrderByOrderId(String orderId);
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.AppleDoMain.OrderApple;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.OrderMapper;
@@ -33,7 +35,15 @@ public class OrderServiceImpl implements IOrderService
 
 
 
-
+    /**
+     * 小程序查询服务订单列表
+     *
+     * @param orderApple 服务订单
+     * @return 服务订单集合
+     */
+    public List<OrderApple> selectOrderAppleList(OrderApple orderApple){
+        return orderMapper.selectOrderAppleList(orderApple);
+    }
 
     public Order selectOrderByOrderId(String orderId){
 

ruoyi-system/src/main/resources/mapper/system/OrderMapper.xml

@@ -1,62 +1,149 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.OrderMapper">
-    
     <resultMap type="Order" id="OrderResult">
-        <result property="id"    column="id"    />
+        <result property="id" column="id"/>
-        <result property="type"    column="type"    />
+        <result property="type" column="type"/>
-        <result property="mainOrderId"    column="main_order_id"    />
+        <result property="mainOrderId" column="main_order_id"/>
-        <result property="orderId"    column="order_id"    />
+        <result property="orderId" column="order_id"/>
-        <result property="transactionId"    column="transaction_id"    />
+        <result property="transactionId" column="transaction_id"/>
-        <result property="createType"    column="create_type"    />
+        <result property="createType" column="create_type"/>
-        <result property="createPhone"    column="create_phone"    />
+        <result property="createPhone" column="create_phone"/>
-        <result property="uid"    column="uid"    />
+        <result property="uid" column="uid"/>
-        <result property="productId"    column="product_id"    />
+        <result property="productId" column="product_id"/>
-        <result property="name"    column="name"    />
+        <result property="name" column="name"/>
-        <result property="phone"    column="phone"    />
+        <result property="phone" column="phone"/>
-        <result property="address"    column="address"    />
+        <result property="address" column="address"/>
-        <result property="makeTime"    column="make_time"    />
+        <result property="makeTime" column="make_time"/>
-        <result property="makeHour"    column="make_hour"    />
+        <result property="makeHour" column="make_hour"/>
-        <result property="num"    column="num"    />
+        <result property="num" column="num"/>
-        <result property="totalPrice"    column="total_price"    />
+        <result property="totalPrice" column="total_price"/>
-        <result property="goodPrice"    column="good_price"    />
+        <result property="goodPrice" column="good_price"/>
-        <result property="servicePrice"    column="service_price"    />
+        <result property="servicePrice" column="service_price"/>
-        <result property="payPrice"    column="pay_price"    />
+        <result property="payPrice" column="pay_price"/>
-        <result property="couponId"    column="coupon_id"    />
+        <result property="couponId" column="coupon_id"/>
-        <result property="deduction"    column="deduction"    />
+        <result property="deduction" column="deduction"/>
-        <result property="payTime"    column="pay_time"    />
+        <result property="payTime" column="pay_time"/>
-        <result property="status"    column="status"    />
+        <result property="status" column="status"/>
-        <result property="isPause"    column="is_pause"    />
+        <result property="isPause" column="is_pause"/>
-        <result property="mark"    column="mark"    />
+        <result property="mark" column="mark"/>
-        <result property="addressId"    column="address_id"    />
+        <result property="addressId" column="address_id"/>
-        <result property="sku"    column="sku"    />
+        <result property="sku" column="sku"/>
-        <result property="workerId"    column="worker_id"    />
+        <result property="workerId" column="worker_id"/>
-        <result property="firstWorkerId"    column="first_worker_id"    />
+        <result property="firstWorkerId" column="first_worker_id"/>
-        <result property="receiveTime"    column="receive_time"    />
+        <result property="receiveTime" column="receive_time"/>
-        <result property="isComment"    column="is_comment"    />
+        <result property="isComment" column="is_comment"/>
-        <result property="receiveType"    column="receive_type"    />
+        <result property="receiveType" column="receive_type"/>
-        <result property="isAccept"    column="is_accept"    />
+        <result property="isAccept" column="is_accept"/>
-        <result property="middlePhone"    column="middle_phone"    />
+        <result property="middlePhone" column="middle_phone"/>
-        <result property="userPhone"    column="user_phone"    />
+        <result property="userPhone" column="user_phone"/>
-        <result property="workerPhone"    column="worker_phone"    />
+        <result property="workerPhone" column="worker_phone"/>
-        <result property="addressEn"    column="address_en"    />
+        <result property="addressEn" column="address_en"/>
-        <result property="uidAdmin"    column="uid_admin"    />
+        <result property="uidAdmin" column="uid_admin"/>
-        <result property="addressAdmin"    column="address_admin"    />
+        <result property="addressAdmin" column="address_admin"/>
-        <result property="logStatus"    column="log_status"    />
+        <result property="logStatus" column="log_status"/>
-        <result property="logJson"    column="log_json"    />
+        <result property="logJson" column="log_json"/>
-        <result property="jsonStatus"    column="json_status"    />
+        <result property="jsonStatus" column="json_status"/>
-        <result property="logImages"    column="log_images"    />
+        <result property="logImages" column="log_images"/>
-        <result property="createdAt"    column="created_at"    />
+        <result property="createdAt" column="created_at"/>
-        <result property="updatedAt"    column="updated_at"    />
+        <result property="updatedAt" column="updated_at"/>
-        <result property="deletedAt"    column="deleted_at"    />
+        <result property="deletedAt" column="deleted_at"/>
     </resultMap>
 
+
+    <resultMap type="OrderApple" id="OrderAppleResult">
+        <result property="created_at" column="deleted_at"/>
+        <result property="id" column="id"/>
+        <result property="is_comment" column="is_comment"/>
+        <result property="make_hour" column="make_hour"/>
+        <result property="make_time" column="make_time"/>
+        <result property="name" column="name"/>
+        <result property="num" column="num"/>
+        <result property="order_id" column="order_id"/>
+        <result property="product_id" column="product_id"/>
+        <result property="sku" column="sku"/>
+        <result property="status" column="status"/>
+        <result property="total_price" column="total_price"/>
+        <result property="type" column="type"/>
+        <result property="uid" column="uid"/>
+    </resultMap>
+
+
     <sql id="selectOrderVo">
-        select id, type, main_order_id, order_id, transaction_id, create_type, create_phone, uid, product_id, name, phone, address, make_time, make_hour, num, total_price, good_price, service_price, pay_price, coupon_id, deduction, pay_time, status, is_pause, mark, address_id, sku, worker_id, first_worker_id, receive_time, is_comment, receive_type, is_accept, middle_phone, user_phone, worker_phone, address_en, uid_admin, address_admin, log_status, log_json, json_status, log_images, created_at, updated_at, deleted_at from order_data
+        select id,
+               type,
+               main_order_id,
+               order_id,
+               transaction_id,
+               create_type,
+               create_phone,
+               uid,
+               product_id,
+               name,
+               phone,
+               address,
+               make_time,
+               make_hour,
+               num,
+               total_price,
+               good_price,
+               service_price,
+               pay_price,
+               coupon_id,
+               deduction,
+               pay_time,
+               status,
+               is_pause,
+               mark,
+               address_id,
+               sku,
+               worker_id,
+               first_worker_id,
+               receive_time,
+               is_comment,
+               receive_type,
+               is_accept,
+               middle_phone,
+               user_phone,
+               worker_phone,
+               address_en,
+               uid_admin,
+               address_admin,
+               log_status,
+               log_json,
+               json_status,
+               log_images,
+               created_at,
+               updated_at,
+               deleted_at
+        from order_data
     </sql>
 
+
+
+
+    <select id="selectOrderAppleList" parameterType="OrderApple" resultMap="OrderAppleResult">
+        <include refid="selectOrderVo"/>
+        <where>
+
+            <if test="uid != null">
+                and uid = #{uid}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+
+
+        </where>
+        order by id desc
+    </select>
+
+
     <select id="selectOrderList" parameterType="Order" resultMap="OrderResult">
         <include refid="selectOrderVo"/>
         <where>
@@ -73,14 +160,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and created_at BETWEEN #{startdate} AND #{enddate}
             </if>
 
-            <if test="orderId != null  and orderId != ''"> and order_id like concat('%',#{orderId},'%')</if>
+            <if test="orderId != null  and orderId != ''">
-            <if test="transactionId != null  and transactionId != ''"> and transaction_id like concat('%',#{transactionId},'%')</if>
+                and order_id like concat('%', #{orderId}, '%')
-            <if test="createPhone != null  and createPhone != ''"> and create_phone like concat('%',#{createPhone},'%')</if>
+            </if>
-            <if test="uid != null "> and uid = #{uid}</if>
+            <if test="transactionId != null  and transactionId != ''">
-            <if test="status != null "> and status = #{status}</if>
+                and transaction_id like concat('%', #{transactionId}, '%')
+            </if>
+            <if test="createPhone != null  and createPhone != ''">
+                and create_phone like concat('%', #{createPhone}, '%')
+            </if>
+            <if test="uid != null">
+                and uid = #{uid}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
 
-            <if test="productId != null "> and product_id = #{productId}</if>
+            <if test="productId != null">
-            <if test="workerId != null "> and worker_id = #{workerId}</if>
+                and product_id = #{productId}
+            </if>
+            <if test="workerId != null">
+                and worker_id = #{workerId}
+            </if>
         </where>
         order by id desc
     </select>
@@ -99,161 +200,419 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertOrder" parameterType="Order" useGeneratedKeys="true" keyProperty="id">
         insert into order_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="type != null">type,</if>
+            <if test="type != null">
-            <if test="mainOrderId != null">main_order_id,</if>
+                type,
-            <if test="orderId != null and orderId != ''">order_id,</if>
+            </if>
-            <if test="transactionId != null">transaction_id,</if>
+            <if test="mainOrderId != null">
-            <if test="createType != null">create_type,</if>
+                main_order_id,
-            <if test="createPhone != null">create_phone,</if>
+            </if>
-            <if test="uid != null">uid,</if>
+            <if test="orderId != null and orderId != ''">
-            <if test="productId != null">product_id,</if>
+                order_id,
-            <if test="name != null and name != ''">name,</if>
+            </if>
-            <if test="phone != null and phone != ''">phone,</if>
+            <if test="transactionId != null">
-            <if test="address != null and address != ''">address,</if>
+                transaction_id,
-            <if test="makeTime != null">make_time,</if>
+            </if>
-            <if test="makeHour != null">make_hour,</if>
+            <if test="createType != null">
-            <if test="num != null">num,</if>
+                create_type,
-            <if test="totalPrice != null">total_price,</if>
+            </if>
-            <if test="goodPrice != null">good_price,</if>
+            <if test="createPhone != null">
-            <if test="servicePrice != null">service_price,</if>
+                create_phone,
-            <if test="payPrice != null">pay_price,</if>
+            </if>
-            <if test="couponId != null">coupon_id,</if>
+            <if test="uid != null">
-            <if test="deduction != null">deduction,</if>
+                uid,
-            <if test="payTime != null">pay_time,</if>
+            </if>
-            <if test="status != null">status,</if>
+            <if test="productId != null">
-            <if test="isPause != null">is_pause,</if>
+                product_id,
-            <if test="mark != null">mark,</if>
+            </if>
-            <if test="addressId != null">address_id,</if>
+            <if test="name != null and name != ''">
-            <if test="sku != null">sku,</if>
+                name,
-            <if test="workerId != null">worker_id,</if>
+            </if>
-            <if test="firstWorkerId != null">first_worker_id,</if>
+            <if test="phone != null and phone != ''">
-            <if test="receiveTime != null">receive_time,</if>
+                phone,
-            <if test="isComment != null">is_comment,</if>
+            </if>
-            <if test="receiveType != null">receive_type,</if>
+            <if test="address != null and address != ''">
-            <if test="isAccept != null">is_accept,</if>
+                address,
-            <if test="middlePhone != null">middle_phone,</if>
+            </if>
-            <if test="userPhone != null">user_phone,</if>
+            <if test="makeTime != null">
-            <if test="workerPhone != null">worker_phone,</if>
+                make_time,
-            <if test="addressEn != null">address_en,</if>
+            </if>
-            <if test="uidAdmin != null">uid_admin,</if>
+            <if test="makeHour != null">
-            <if test="addressAdmin != null">address_admin,</if>
+                make_hour,
-            <if test="logStatus != null">log_status,</if>
+            </if>
-            <if test="logJson != null">log_json,</if>
+            <if test="num != null">
-            <if test="jsonStatus != null">json_status,</if>
+                num,
-            <if test="logImages != null">log_images,</if>
+            </if>
-            <if test="deletedAt != null">deleted_at,</if>
+            <if test="totalPrice != null">
+                total_price,
+            </if>
+            <if test="goodPrice != null">
+                good_price,
+            </if>
+            <if test="servicePrice != null">
+                service_price,
+            </if>
+            <if test="payPrice != null">
+                pay_price,
+            </if>
+            <if test="couponId != null">
+                coupon_id,
+            </if>
+            <if test="deduction != null">
+                deduction,
+            </if>
+            <if test="payTime != null">
+                pay_time,
+            </if>
+            <if test="status != null">
+                status,
+            </if>
+            <if test="isPause != null">
+                is_pause,
+            </if>
+            <if test="mark != null">
+                mark,
+            </if>
+            <if test="addressId != null">
+                address_id,
+            </if>
+            <if test="sku != null">
+                sku,
+            </if>
+            <if test="workerId != null">
+                worker_id,
+            </if>
+            <if test="firstWorkerId != null">
+                first_worker_id,
+            </if>
+            <if test="receiveTime != null">
+                receive_time,
+            </if>
+            <if test="isComment != null">
+                is_comment,
+            </if>
+            <if test="receiveType != null">
+                receive_type,
+            </if>
+            <if test="isAccept != null">
+                is_accept,
+            </if>
+            <if test="middlePhone != null">
+                middle_phone,
+            </if>
+            <if test="userPhone != null">
+                user_phone,
+            </if>
+            <if test="workerPhone != null">
+                worker_phone,
+            </if>
+            <if test="addressEn != null">
+                address_en,
+            </if>
+            <if test="uidAdmin != null">
+                uid_admin,
+            </if>
+            <if test="addressAdmin != null">
+                address_admin,
+            </if>
+            <if test="logStatus != null">
+                log_status,
+            </if>
+            <if test="logJson != null">
+                log_json,
+            </if>
+            <if test="jsonStatus != null">
+                json_status,
+            </if>
+            <if test="logImages != null">
+                log_images,
+            </if>
+            <if test="deletedAt != null">
+                deleted_at,
+            </if>
             created_at,
             updated_at
-
+        </trim>
-         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="type != null">#{type},</if>
+            <if test="type != null">
-            <if test="mainOrderId != null">#{mainOrderId},</if>
+                #{type},
-            <if test="orderId != null and orderId != ''">#{orderId},</if>
+            </if>
-            <if test="transactionId != null">#{transactionId},</if>
+            <if test="mainOrderId != null">
-            <if test="createType != null">#{createType},</if>
+                #{mainOrderId},
-            <if test="createPhone != null">#{createPhone},</if>
+            </if>
-            <if test="uid != null">#{uid},</if>
+            <if test="orderId != null and orderId != ''">
-            <if test="productId != null">#{productId},</if>
+                #{orderId},
-            <if test="name != null and name != ''">#{name},</if>
+            </if>
-            <if test="phone != null and phone != ''">#{phone},</if>
+            <if test="transactionId != null">
-            <if test="address != null and address != ''">#{address},</if>
+                #{transactionId},
-            <if test="makeTime != null">#{makeTime},</if>
+            </if>
-            <if test="makeHour != null">#{makeHour},</if>
+            <if test="createType != null">
-            <if test="num != null">#{num},</if>
+                #{createType},
-            <if test="totalPrice != null">#{totalPrice},</if>
+            </if>
-            <if test="goodPrice != null">#{goodPrice},</if>
+            <if test="createPhone != null">
-            <if test="servicePrice != null">#{servicePrice},</if>
+                #{createPhone},
-            <if test="payPrice != null">#{payPrice},</if>
+            </if>
-            <if test="couponId != null">#{couponId},</if>
+            <if test="uid != null">
-            <if test="deduction != null">#{deduction},</if>
+                #{uid},
-            <if test="payTime != null">#{payTime},</if>
+            </if>
-            <if test="status != null">#{status},</if>
+            <if test="productId != null">
-            <if test="isPause != null">#{isPause},</if>
+                #{productId},
-            <if test="mark != null">#{mark},</if>
+            </if>
-            <if test="addressId != null">#{addressId},</if>
+            <if test="name != null and name != ''">
-            <if test="sku != null">#{sku},</if>
+                #{name},
-            <if test="workerId != null">#{workerId},</if>
+            </if>
-            <if test="firstWorkerId != null">#{firstWorkerId},</if>
+            <if test="phone != null and phone != ''">
-            <if test="receiveTime != null">#{receiveTime},</if>
+                #{phone},
-            <if test="isComment != null">#{isComment},</if>
+            </if>
-            <if test="receiveType != null">#{receiveType},</if>
+            <if test="address != null and address != ''">
-            <if test="isAccept != null">#{isAccept},</if>
+                #{address},
-            <if test="middlePhone != null">#{middlePhone},</if>
+            </if>
-            <if test="userPhone != null">#{userPhone},</if>
+            <if test="makeTime != null">
-            <if test="workerPhone != null">#{workerPhone},</if>
+                #{makeTime},
-            <if test="addressEn != null">#{addressEn},</if>
+            </if>
-            <if test="uidAdmin != null">#{uidAdmin},</if>
+            <if test="makeHour != null">
-            <if test="addressAdmin != null">#{addressAdmin},</if>
+                #{makeHour},
-            <if test="logStatus != null">#{logStatus},</if>
+            </if>
-            <if test="logJson != null">#{logJson},</if>
+            <if test="num != null">
-            <if test="jsonStatus != null">#{jsonStatus},</if>
+                #{num},
-            <if test="logImages != null">#{logImages},</if>
+            </if>
-            <if test="deletedAt != null">#{deletedAt},</if>
+            <if test="totalPrice != null">
+                #{totalPrice},
+            </if>
+            <if test="goodPrice != null">
+                #{goodPrice},
+            </if>
+            <if test="servicePrice != null">
+                #{servicePrice},
+            </if>
+            <if test="payPrice != null">
+                #{payPrice},
+            </if>
+            <if test="couponId != null">
+                #{couponId},
+            </if>
+            <if test="deduction != null">
+                #{deduction},
+            </if>
+            <if test="payTime != null">
+                #{payTime},
+            </if>
+            <if test="status != null">
+                #{status},
+            </if>
+            <if test="isPause != null">
+                #{isPause},
+            </if>
+            <if test="mark != null">
+                #{mark},
+            </if>
+            <if test="addressId != null">
+                #{addressId},
+            </if>
+            <if test="sku != null">
+                #{sku},
+            </if>
+            <if test="workerId != null">
+                #{workerId},
+            </if>
+            <if test="firstWorkerId != null">
+                #{firstWorkerId},
+            </if>
+            <if test="receiveTime != null">
+                #{receiveTime},
+            </if>
+            <if test="isComment != null">
+                #{isComment},
+            </if>
+            <if test="receiveType != null">
+                #{receiveType},
+            </if>
+            <if test="isAccept != null">
+                #{isAccept},
+            </if>
+            <if test="middlePhone != null">
+                #{middlePhone},
+            </if>
+            <if test="userPhone != null">
+                #{userPhone},
+            </if>
+            <if test="workerPhone != null">
+                #{workerPhone},
+            </if>
+            <if test="addressEn != null">
+                #{addressEn},
+            </if>
+            <if test="uidAdmin != null">
+                #{uidAdmin},
+            </if>
+            <if test="addressAdmin != null">
+                #{addressAdmin},
+            </if>
+            <if test="logStatus != null">
+                #{logStatus},
+            </if>
+            <if test="logJson != null">
+                #{logJson},
+            </if>
+            <if test="jsonStatus != null">
+                #{jsonStatus},
+            </if>
+            <if test="logImages != null">
+                #{logImages},
+            </if>
+            <if test="deletedAt != null">
+                #{deletedAt},
+            </if>
             NOW(),
             NOW()
-
+        </trim>
-         </trim>
     </insert>
 
     <update id="updateOrder" parameterType="Order">
         update order_data
         <trim prefix="SET" suffixOverrides=",">
-            <if test="type != null">type = #{type},</if>
+            <if test="type != null">
-            <if test="mainOrderId != null">main_order_id = #{mainOrderId},</if>
+                type = #{type},
-            <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            </if>
-            <if test="transactionId != null">transaction_id = #{transactionId},</if>
+            <if test="mainOrderId != null">
-            <if test="createType != null">create_type = #{createType},</if>
+                main_order_id = #{mainOrderId},
-            <if test="createPhone != null">create_phone = #{createPhone},</if>
+            </if>
-            <if test="uid != null">uid = #{uid},</if>
+            <if test="orderId != null and orderId != ''">
-            <if test="productId != null">product_id = #{productId},</if>
+                order_id = #{orderId},
-            <if test="name != null and name != ''">name = #{name},</if>
+            </if>
-            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="transactionId != null">
-            <if test="address != null and address != ''">address = #{address},</if>
+                transaction_id = #{transactionId},
-            <if test="makeTime != null">make_time = #{makeTime},</if>
+            </if>
-            <if test="makeHour != null">make_hour = #{makeHour},</if>
+            <if test="createType != null">
-            <if test="num != null">num = #{num},</if>
+                create_type = #{createType},
-            <if test="totalPrice != null">total_price = #{totalPrice},</if>
+            </if>
-            <if test="goodPrice != null">good_price = #{goodPrice},</if>
+            <if test="createPhone != null">
-            <if test="servicePrice != null">service_price = #{servicePrice},</if>
+                create_phone = #{createPhone},
-            <if test="payPrice != null">pay_price = #{payPrice},</if>
+            </if>
-            <if test="couponId != null">coupon_id = #{couponId},</if>
+            <if test="uid != null">
-            <if test="deduction != null">deduction = #{deduction},</if>
+                uid = #{uid},
-            <if test="payTime != null">pay_time = #{payTime},</if>
+            </if>
-            <if test="status != null">status = #{status},</if>
+            <if test="productId != null">
-            <if test="isPause != null">is_pause = #{isPause},</if>
+                product_id = #{productId},
-            <if test="mark != null">mark = #{mark},</if>
+            </if>
-            <if test="addressId != null">address_id = #{addressId},</if>
+            <if test="name != null and name != ''">
-            <if test="sku != null">sku = #{sku},</if>
+                name = #{name},
-            <if test="workerId != null">worker_id = #{workerId},</if>
+            </if>
-            <if test="firstWorkerId != null">first_worker_id = #{firstWorkerId},</if>
+            <if test="phone != null and phone != ''">
-            <if test="receiveTime != null">receive_time = #{receiveTime},</if>
+                phone = #{phone},
-            <if test="isComment != null">is_comment = #{isComment},</if>
+            </if>
-            <if test="receiveType != null">receive_type = #{receiveType},</if>
+            <if test="address != null and address != ''">
-            <if test="isAccept != null">is_accept = #{isAccept},</if>
+                address = #{address},
-            <if test="middlePhone != null">middle_phone = #{middlePhone},</if>
+            </if>
-            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="makeTime != null">
-            <if test="workerPhone != null">worker_phone = #{workerPhone},</if>
+                make_time = #{makeTime},
-            <if test="addressEn != null">address_en = #{addressEn},</if>
+            </if>
-            <if test="uidAdmin != null">uid_admin = #{uidAdmin},</if>
+            <if test="makeHour != null">
-            <if test="addressAdmin != null">address_admin = #{addressAdmin},</if>
+                make_hour = #{makeHour},
-            <if test="logStatus != null">log_status = #{logStatus},</if>
+            </if>
-            <if test="logJson != null">log_json = #{logJson},</if>
+            <if test="num != null">
-            <if test="jsonStatus != null">json_status = #{jsonStatus},</if>
+                num = #{num},
-            <if test="logImages != null">log_images = #{logImages},</if>
+            </if>
-            <if test="deletedAt != null">deleted_at = #{deletedAt},</if>
+            <if test="totalPrice != null">
+                total_price = #{totalPrice},
+            </if>
+            <if test="goodPrice != null">
+                good_price = #{goodPrice},
+            </if>
+            <if test="servicePrice != null">
+                service_price = #{servicePrice},
+            </if>
+            <if test="payPrice != null">
+                pay_price = #{payPrice},
+            </if>
+            <if test="couponId != null">
+                coupon_id = #{couponId},
+            </if>
+            <if test="deduction != null">
+                deduction = #{deduction},
+            </if>
+            <if test="payTime != null">
+                pay_time = #{payTime},
+            </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="isPause != null">
+                is_pause = #{isPause},
+            </if>
+            <if test="mark != null">
+                mark = #{mark},
+            </if>
+            <if test="addressId != null">
+                address_id = #{addressId},
+            </if>
+            <if test="sku != null">
+                sku = #{sku},
+            </if>
+            <if test="workerId != null">
+                worker_id = #{workerId},
+            </if>
+            <if test="firstWorkerId != null">
+                first_worker_id = #{firstWorkerId},
+            </if>
+            <if test="receiveTime != null">
+                receive_time = #{receiveTime},
+            </if>
+            <if test="isComment != null">
+                is_comment = #{isComment},
+            </if>
+            <if test="receiveType != null">
+                receive_type = #{receiveType},
+            </if>
+            <if test="isAccept != null">
+                is_accept = #{isAccept},
+            </if>
+            <if test="middlePhone != null">
+                middle_phone = #{middlePhone},
+            </if>
+            <if test="userPhone != null">
+                user_phone = #{userPhone},
+            </if>
+            <if test="workerPhone != null">
+                worker_phone = #{workerPhone},
+            </if>
+            <if test="addressEn != null">
+                address_en = #{addressEn},
+            </if>
+            <if test="uidAdmin != null">
+                uid_admin = #{uidAdmin},
+            </if>
+            <if test="addressAdmin != null">
+                address_admin = #{addressAdmin},
+            </if>
+            <if test="logStatus != null">
+                log_status = #{logStatus},
+            </if>
+            <if test="logJson != null">
+                log_json = #{logJson},
+            </if>
+            <if test="jsonStatus != null">
+                json_status = #{jsonStatus},
+            </if>
+            <if test="logImages != null">
+                log_images = #{logImages},
+            </if>
+            <if test="deletedAt != null">
+                deleted_at = #{deletedAt},
+            </if>
             updated_at = NOW()
-
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteOrderById" parameterType="Long">
-        delete from order_data where id = #{id}
+        delete
+        from order_data
+        where id = #{id}
     </delete>
 
     <delete id="deleteOrderByIds" parameterType="String">
-        delete from order_data where id in
+        delete
+        from order_data where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/UserAddressMapper.xml

@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateUserAddressDefault" parameterType="Long">
         update user_address
         <trim prefix="SET" suffixOverrides=",">
-         is_default =0
+         is_default =0,
         updated_at=NOW()
         </trim>
         where uid = #{uid}