订单管理修改

361d0e68 · 董有沛 · c37454d9 · 361d0e68 · 361d0e68
Commit 361d0e68 authored Feb 28, 2020 by 董有沛
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

common/src/main/java/com/winsun/bean/Order.java
+2 -5

service-manager/src/main/java/com/winsun/controller/OrderController.java
+1 -1

No files found.
--- a/common/src/main/java/com/winsun/bean/Order.java
+++ b/common/src/main/java/com/winsun/bean/Order.java
 package com.winsun.bean;
 import java.io.Serializable;
-import java.sql.Date;
+import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
@@ -20,8 +18,7 @@ public class Order implements Serializable{
 	/**
 	 * 主键
 	 */
-	@TableId(value = "id", type = IdType.AUTO)
+	private String id;
-	private int id;
 	/**
 	 * 订单号

--- a/service-manager/src/main/java/com/winsun/controller/OrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderController.java
@@ -92,7 +92,7 @@ public class OrderController extends BaseController {
        wrapper.le(StringUtils.isNotBlank(successTimeEnd),"success_time",successTimeEnd);
        wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
        wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
-        wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
+        //wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
        wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
        wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
        wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);