From c60a913ea323a13d930e596a34a38cb74aeb6ce7 Mon Sep 17 00:00:00 2001 From: Anayigeren <15659576701@163.com> Date: Tue, 8 Apr 2025 16:30:55 +0800 Subject: [PATCH 1/3] lzh --- .../org/csource/fastdfs/ClientGlobal.java | 61 +++++++++---------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/csource/fastdfs/ClientGlobal.java b/src/main/java/org/csource/fastdfs/ClientGlobal.java index 63fce64..01f1502 100644 --- a/src/main/java/org/csource/fastdfs/ClientGlobal.java +++ b/src/main/java/org/csource/fastdfs/ClientGlobal.java @@ -1,11 +1,3 @@ -/** -* Copyright (C) 2008 Happy Fish / YuQing -* -* FastDFS Java Client may be copied only under the terms of the GNU Lesser -* General Public License (LGPL). -* Please visit the FastDFS Home Page http://www.csource.org/ for more detail. -**/ - package org.csource.fastdfs; import java.net.*; @@ -13,11 +5,6 @@ import java.io.*; import java.net.*; import org.csource.common.*; -/** -* Global variables -* @author Happy Fish / YuQing -* @version Version 1.11 -*/ public class ClientGlobal { public static int g_connect_timeout; //millisecond @@ -27,18 +14,14 @@ public class ClientGlobal public static boolean g_anti_steal_token; //if anti-steal token public static String g_secret_key; //generage token secret key public static TrackerGroup g_tracker_group; - public static final int DEFAULT_CONNECT_TIMEOUT = 5; //second public static final int DEFAULT_NETWORK_TIMEOUT = 30; //second private ClientGlobal() { } - -/** -* load global variables -* @param conf_filename config filename -*/ + + // 初始化ClientGlobal public static void init(String conf_filename) throws FileNotFoundException, IOException, MyException { IniFileReader iniReader; @@ -47,6 +30,7 @@ public class ClientGlobal iniReader = new IniFileReader(conf_filename); + // 读取连接超时时间 g_connect_timeout = iniReader.getIntValue("connect_timeout", DEFAULT_CONNECT_TIMEOUT); if (g_connect_timeout < 0) { @@ -54,6 +38,7 @@ public class ClientGlobal } g_connect_timeout *= 1000; //millisecond + // 读取网络超时时间 g_network_timeout = iniReader.getIntValue("network_timeout", DEFAULT_NETWORK_TIMEOUT); if (g_network_timeout < 0) { @@ -61,18 +46,21 @@ public class ClientGlobal } g_network_timeout *= 1000; //millisecond + // 读取字符集 g_charset = iniReader.getStrValue("charset"); if (g_charset == null || g_charset.length() == 0) { g_charset = "ISO8859-1"; } + // 读取tracker服务器地址 szTrackerServers = iniReader.getValues("tracker_server"); if (szTrackerServers == null) { throw new MyException("item \"tracker_server\" in " + conf_filename + " not found"); } + // 将tracker服务器地址转换为InetSocketAddress数组 InetSocketAddress[] tracker_servers = new InetSocketAddress[szTrackerServers.length]; for (int i=0; i Date: Tue, 8 Apr 2025 17:00:45 +0800 Subject: [PATCH 2/3] lzh --- .../ReceivingCodeRequestController.java | 11 +- .../controller/ReturnOrderController.java | 49 +-- .../entity/TbReceivingCodeRequest.java | 29 +- .../entity/TbReceivingCodeRequestExample.java | 97 ++++++ .../mapper/TbReceivingCodeRequestMapper.java | 5 + .../mapper/ReceivingCodeRequestMapper.java | 2 + .../mapper/ReceivingCodeRequestMapper.xml | 3 + .../receipt/mapper/ReturnOrderMapper.java | 6 +- .../receipt/mapper/ReturnOrderMapper.xml | 3 +- .../model/ReceivingCodeRequestModel.java | 39 +-- .../module/receipt/model/ReturnItemModel.java | 4 + .../receipt/model/ReturnOrderModel.java | 191 ++++------- .../receipt/model/ReturnOrderQuery.java | 15 +- .../receipt/service/ReturnOrderService.java | 324 +++++++++--------- .../org/csource/fastdfs/DownloadStream.java | 19 +- .../webapp/doc/swagger-ui/dist/index.html | 6 + 16 files changed, 426 insertions(+), 377 deletions(-) diff --git a/src/main/java/com/xmomen/module/receipt/controller/ReceivingCodeRequestController.java b/src/main/java/com/xmomen/module/receipt/controller/ReceivingCodeRequestController.java index 7261828..7538cbe 100644 --- a/src/main/java/com/xmomen/module/receipt/controller/ReceivingCodeRequestController.java +++ b/src/main/java/com/xmomen/module/receipt/controller/ReceivingCodeRequestController.java @@ -19,12 +19,10 @@ import com.xmomen.module.receipt.mapper.ReceivingCodeRequestMapper; public class ReceivingCodeRequestController { @Autowired MybatisDao mybatisDao; - - /** - * 查询收货码请求 - * @param id - * @return - */ + + /* + 查询收货码请求 + */ @RequestMapping(value = "/receivingCodeRequest", method = RequestMethod.GET) @Log(actionName = "查询收货码请求") public Page getExpressList(@RequestParam(value = "limit") Integer limit, @@ -38,6 +36,7 @@ public class ReceivingCodeRequestController { map.put("keyword", keyword); map.put("requestTimeStart", requestTimeStart); map.put("requestTimeEnd", requestTimeEnd); + // 调用mybatisDao的selectPage方法，传入ReceivingCodeRequestMapperNameSpace + "getReceivingCodeRequestList"作为参数，map作为参数，limit和offset作为参数 return (Page) mybatisDao.selectPage(ReceivingCodeRequestMapper.ReceivingCodeRequestMapperNameSpace + "getReceivingCodeRequestList", map, limit, offset); } diff --git a/src/main/java/com/xmomen/module/receipt/controller/ReturnOrderController.java b/src/main/java/com/xmomen/module/receipt/controller/ReturnOrderController.java index 2e41b6b..348965d 100644 --- a/src/main/java/com/xmomen/module/receipt/controller/ReturnOrderController.java +++ b/src/main/java/com/xmomen/module/receipt/controller/ReturnOrderController.java @@ -22,9 +22,7 @@ import com.xmomen.module.receipt.model.ReturnOrderModel; import com.xmomen.module.receipt.model.ReturnOrderQuery; import com.xmomen.module.receipt.service.ReturnOrderService; -/** - * Created by Jeng on 2016/3/30. - */ + @RestController public class ReturnOrderController { @@ -34,13 +32,8 @@ public class ReturnOrderController { @Autowired MybatisDao mybatisDao; - /** - * 退货订单列表 - * @param limit - * @param offset - * @param keyword - * @return - */ + + // 查询退货订单列表 @RequestMapping(value = "/returnOrder", method = RequestMethod.GET) @Log(actionName = "查询退货订单列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -50,29 +43,22 @@ public class ReturnOrderController { @RequestParam(value = "returnTimeStart",required = false) String returnTimeStart, @RequestParam(value = "returnTimeEnd",required = false) String returnTimeEnd ){ + // 创建退货订单查询对象 ReturnOrderQuery orderQuery = new ReturnOrderQuery(); orderQuery.setKeyword(keyword); + // 如果退货时间开始不为空，则设置退货时间开始 if(StringUtilsExt.isNotBlank(returnTimeStart)){ orderQuery.setReturnTimeStart(returnTimeStart); } + // 如果退货时间结束不为空，则设置退货时间结束 if(StringUtilsExt.isNotBlank(returnTimeEnd)){ orderQuery.setReturnTimeEnd(returnTimeEnd); } - //客服经理过滤 如果有客服组权限则不过滤 -// if(SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_MANAGER_PERMISSION_CODE) && !SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_PERMISSION_CODE)){ -// Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); -// orderQuery.setCreateUserId(userId); -// } + } + // 调用退货订单服务，获取退货订单列表 return returnOrderService.getReturnOrderList(orderQuery, limit, offset); } - /** - * 查询退货订单商品列表 - * @param limit - * @param offset - * @param orderNo - * @return - */ @RequestMapping(value = "/returnOrder/{id}/item", method = RequestMethod.GET) @Log(actionName = "查询退货订单商品列表") public Page getUserList(@RequestParam(value = "limit") Integer limit, @@ -83,12 +69,7 @@ public class ReturnOrderController { return mybatisDao.selectPageByModel(returnOrderItem, limit, offset); } - /** - * 审核退货订单 - * @param orderNo - * @param statusCd - * @return - */ + @RequestMapping(value = "/returnOrder/{id}/audit", method = RequestMethod.POST) @Log(actionName = "审核退货订单") public void auditReturnOrder(@PathVariable(value = "id") Integer id, @@ -96,20 +77,16 @@ public class ReturnOrderController { this.returnOrderService.auditReturnOrder(id,statusCd); } - /** - * 退货收货扫描操作 - * @param boxNo 箱号 - */ + + // 调用退货订单服务，审核退货订单 @RequestMapping(value ="/returnOrder/returnOrderShouhuo",method = RequestMethod.PUT) @Log(actionName = "退货收货扫描操作") public ReturnOrderModel returnOrderShouhuo(@RequestParam(value = "boxNo")String boxNo){ return this.returnOrderService.returnOrderShouhuo(boxNo); } - /** - * 退货收货操作 - * @param boxNo 箱号 - */ + + // 调用退货订单服务，退货收货扫描操作 @RequestMapping(value ="/returnOrder/shouhuo",method = RequestMethod.PUT) @Log(actionName = "退货收货操作") public void orderNo(@RequestParam(value = "orderNo")String orderNo){ diff --git a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java index 8e130c3..eb3b3f9 100644 --- a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java +++ b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java @@ -12,34 +12,27 @@ import javax.persistence.Version; @Entity @Table(name = "tb_receiving_code_request") public class TbReceivingCodeRequest extends BaseMybatisModel { - /** - * 主键 - */ + + // 主键ID private Integer id; - /** - * 订单号 - */ + // 订单号 private String orderNo; - /** - * 请求人 - */ + + // 请求用户 private String requestUser; - /** - * 请求时间 - */ + + // 请求时间 private Date requestTime; - /** - * 请求人手机号 - */ + + // 请求电话 private String requestPhone; - /** - * 请求人所属快递商 - */ + + // 请求快递ID private Integer requestExpressId; @Column(name = "id") diff --git a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java index 1764e7b..f0e8c43 100644 --- a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java +++ b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java @@ -5,47 +5,60 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +// 定义一个名为TbReceivingCodeRequestExample的类，继承自BaseMybatisExample public class TbReceivingCodeRequestExample extends BaseMybatisExample { + // 定义一个orderByClause变量，用于存储排序字段 protected String orderByClause; + // 定义一个distinct变量，用于存储是否去重 protected boolean distinct; + // 定义一个oredCriteria变量，用于存储查询条件 protected List oredCriteria; + // 构造函数，初始化oredCriteria public TbReceivingCodeRequestExample() { oredCriteria = new ArrayList(); } + // 设置orderByClause的值 public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; } + // 获取orderByClause的值 public String getOrderByClause() { return orderByClause; } + // 设置distinct的值 public void setDistinct(boolean distinct) { this.distinct = distinct; } + // 获取distinct的值 public boolean isDistinct() { return distinct; } + // 获取oredCriteria的值 public List getOredCriteria() { return oredCriteria; } + // 添加一个查询条件 public void or(Criteria criteria) { oredCriteria.add(criteria); } + // 创建一个查询条件 public Criteria or() { Criteria criteria = createCriteriaInternal(); oredCriteria.add(criteria); return criteria; } + // 创建一个查询条件 public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); if (oredCriteria.size() == 0) { @@ -54,37 +67,46 @@ public class TbReceivingCodeRequestExample extends BaseMybatisExample { return criteria; } + // 创建一个查询条件 protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); return criteria; } + // 清空查询条件 public void clear() { oredCriteria.clear(); orderByClause = null; distinct = false; } + // 定义一个内部类GeneratedCriteria，用于存储查询条件 protected abstract static class GeneratedCriteria { + // 定义一个criteria变量，用于存储查询条件 protected List criteria; + // 构造函数，初始化criteria protected GeneratedCriteria() { super(); criteria = new ArrayList(); } + // 判断查询条件是否有效 public boolean isValid() { return criteria.size() > 0; } + // 获取所有查询条件 public List getAllCriteria() { return criteria; } + // 获取查询条件 public List getCriteria() { return criteria; } + // 添加一个查询条件 protected void addCriterion(String condition) { if (condition == null) { throw new RuntimeException("Value for condition cannot be null"); @@ -92,6 +114,7 @@ public class TbReceivingCodeRequestExample extends BaseMybatisExample { criteria.add(new Criterion(condition)); } + // 添加一个查询条件 protected void addCriterion(String condition, Object value, String property) { if (value == null) { throw new RuntimeException("Value for " + property + " cannot be null"); @@ -99,6 +122,7 @@ public class TbReceivingCodeRequestExample extends BaseMybatisExample { criteria.add(new Criterion(condition, value)); } + // 添加一个查询条件 protected void addCriterion(String condition, Object value1, Object value2, String property) { if (value1 == null || value2 == null) { throw new RuntimeException("Between values for " + property + " cannot be null"); @@ -106,366 +130,439 @@ public class TbReceivingCodeRequestExample extends BaseMybatisExample { criteria.add(new Criterion(condition, value1, value2)); } + // 判断id是否为空 public Criteria andIdIsNull() { addCriterion("id is null"); return (Criteria) this; } + // 判断id是否不为空 public Criteria andIdIsNotNull() { addCriterion("id is not null"); return (Criteria) this; } + // 判断id是否等于某个值 public Criteria andIdEqualTo(Integer value) { addCriterion("id =", value, "id"); return (Criteria) this; } + // 判断id是否不等于某个值 public Criteria andIdNotEqualTo(Integer value) { addCriterion("id <>", value, "id"); return (Criteria) this; } + // 判断id是否大于某个值 public Criteria andIdGreaterThan(Integer value) { addCriterion("id >", value, "id"); return (Criteria) this; } + // 判断id是否大于等于某个值 public Criteria andIdGreaterThanOrEqualTo(Integer value) { addCriterion("id >=", value, "id"); return (Criteria) this; } + // 判断id是否小于某个值 public Criteria andIdLessThan(Integer value) { addCriterion("id <", value, "id"); return (Criteria) this; } + // 判断id是否小于等于某个值 public Criteria andIdLessThanOrEqualTo(Integer value) { addCriterion("id <=", value, "id"); return (Criteria) this; } + // 判断id是否在某个范围内 public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } + // 判断id是否不在某个范围内 public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } + // 判断id是否在某个范围内 public Criteria andIdBetween(Integer value1, Integer value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } + // 判断id是否不在某个范围内 public Criteria andIdNotBetween(Integer value1, Integer value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } + // 判断orderNo是否为空 public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; } + // 判断orderNo是否不为空 public Criteria andOrderNoIsNotNull() { addCriterion("order_no is not null"); return (Criteria) this; } + // 判断orderNo是否等于某个值 public Criteria andOrderNoEqualTo(String value) { addCriterion("order_no =", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否不等于某个值 public Criteria andOrderNoNotEqualTo(String value) { addCriterion("order_no <>", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否大于某个值 public Criteria andOrderNoGreaterThan(String value) { addCriterion("order_no >", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否大于等于某个值 public Criteria andOrderNoGreaterThanOrEqualTo(String value) { addCriterion("order_no >=", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否小于某个值 public Criteria andOrderNoLessThan(String value) { addCriterion("order_no <", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否小于等于某个值 public Criteria andOrderNoLessThanOrEqualTo(String value) { addCriterion("order_no <=", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否包含某个值 public Criteria andOrderNoLike(String value) { addCriterion("order_no like", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否不包含某个值 public Criteria andOrderNoNotLike(String value) { addCriterion("order_no not like", value, "orderNo"); return (Criteria) this; } + // 判断orderNo是否在某个范围内 public Criteria andOrderNoIn(List values) { addCriterion("order_no in", values, "orderNo"); return (Criteria) this; } + // 判断orderNo是否不在某个范围内 public Criteria andOrderNoNotIn(List values) { addCriterion("order_no not in", values, "orderNo"); return (Criteria) this; } + // 判断orderNo是否在某个范围内 public Criteria andOrderNoBetween(String value1, String value2) { addCriterion("order_no between", value1, value2, "orderNo"); return (Criteria) this; } + // 判断orderNo是否不在某个范围内 public Criteria andOrderNoNotBetween(String value1, String value2) { addCriterion("order_no not between", value1, value2, "orderNo"); return (Criteria) this; } + // 判断requestUser是否为空 public Criteria andRequestUserIsNull() { addCriterion("request_user is null"); return (Criteria) this; } + // 判断requestUser是否不为空 public Criteria andRequestUserIsNotNull() { addCriterion("request_user is not null"); return (Criteria) this; } + // 判断requestUser是否等于某个值 public Criteria andRequestUserEqualTo(String value) { addCriterion("request_user =", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否不等于某个值 public Criteria andRequestUserNotEqualTo(String value) { addCriterion("request_user <>", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否大于某个值 public Criteria andRequestUserGreaterThan(String value) { addCriterion("request_user >", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否大于等于某个值 public Criteria andRequestUserGreaterThanOrEqualTo(String value) { addCriterion("request_user >=", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否小于某个值 public Criteria andRequestUserLessThan(String value) { addCriterion("request_user <", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否小于等于某个值 public Criteria andRequestUserLessThanOrEqualTo(String value) { addCriterion("request_user <=", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否包含某个值 public Criteria andRequestUserLike(String value) { addCriterion("request_user like", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否不包含某个值 public Criteria andRequestUserNotLike(String value) { addCriterion("request_user not like", value, "requestUser"); return (Criteria) this; } + // 判断requestUser是否在某个范围内 public Criteria andRequestUserIn(List values) { addCriterion("request_user in", values, "requestUser"); return (Criteria) this; } + // 判断requestUser是否不在某个范围内 public Criteria andRequestUserNotIn(List values) { addCriterion("request_user not in", values, "requestUser"); return (Criteria) this; } + // 判断requestUser是否在某个范围内 public Criteria andRequestUserBetween(String value1, String value2) { addCriterion("request_user between", value1, value2, "requestUser"); return (Criteria) this; } + // 判断requestUser是否不在某个范围内 public Criteria andRequestUserNotBetween(String value1, String value2) { addCriterion("request_user not between", value1, value2, "requestUser"); return (Criteria) this; } + // 判断requestTime是否为空 public Criteria andRequestTimeIsNull() { addCriterion("request_time is null"); return (Criteria) this; } + // 判断requestTime是否不为空 public Criteria andRequestTimeIsNotNull() { addCriterion("request_time is not null"); return (Criteria) this; } + // 判断requestTime是否等于某个值 public Criteria andRequestTimeEqualTo(Date value) { addCriterion("request_time =", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否不等于某个值 public Criteria andRequestTimeNotEqualTo(Date value) { addCriterion("request_time <>", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否大于某个值 public Criteria andRequestTimeGreaterThan(Date value) { addCriterion("request_time >", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否大于等于某个值 public Criteria andRequestTimeGreaterThanOrEqualTo(Date value) { addCriterion("request_time >=", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否小于某个值 public Criteria andRequestTimeLessThan(Date value) { addCriterion("request_time <", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否小于等于某个值 public Criteria andRequestTimeLessThanOrEqualTo(Date value) { addCriterion("request_time <=", value, "requestTime"); return (Criteria) this; } + // 判断requestTime是否在某个范围内 public Criteria andRequestTimeIn(List values) { addCriterion("request_time in", values, "requestTime"); return (Criteria) this; } + // 判断requestTime是否不在某个范围内 public Criteria andRequestTimeNotIn(List values) { addCriterion("request_time not in", values, "requestTime"); return (Criteria) this; } + // 判断requestTime是否在某个范围内 public Criteria andRequestTimeBetween(Date value1, Date value2) { addCriterion("request_time between", value1, value2, "requestTime"); return (Criteria) this; } + // 判断requestTime是否不在某个范围内 public Criteria andRequestTimeNotBetween(Date value1, Date value2) { addCriterion("request_time not between", value1, value2, "requestTime"); return (Criteria) this; } + // 判断requestPhone是否为空 public Criteria andRequestPhoneIsNull() { addCriterion("request_phone is null"); return (Criteria) this; } + // 判断requestPhone是否不为空 public Criteria andRequestPhoneIsNotNull() { addCriterion("request_phone is not null"); return (Criteria) this; } + // 判断requestPhone是否等于某个值 public Criteria andRequestPhoneEqualTo(String value) { addCriterion("request_phone =", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否不等于某个值 public Criteria andRequestPhoneNotEqualTo(String value) { addCriterion("request_phone <>", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否大于某个值 public Criteria andRequestPhoneGreaterThan(String value) { addCriterion("request_phone >", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否大于等于某个值 public Criteria andRequestPhoneGreaterThanOrEqualTo(String value) { addCriterion("request_phone >=", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否小于某个值 public Criteria andRequestPhoneLessThan(String value) { addCriterion("request_phone <", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否小于等于某个值 public Criteria andRequestPhoneLessThanOrEqualTo(String value) { addCriterion("request_phone <=", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否包含某个值 public Criteria andRequestPhoneLike(String value) { addCriterion("request_phone like", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否不包含某个值 public Criteria andRequestPhoneNotLike(String value) { addCriterion("request_phone not like", value, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否在某个范围内 public Criteria andRequestPhoneIn(List values) { addCriterion("request_phone in", values, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否不在某个范围内 public Criteria andRequestPhoneNotIn(List values) { addCriterion("request_phone not in", values, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否在某个范围内 public Criteria andRequestPhoneBetween(String value1, String value2) { addCriterion("request_phone between", value1, value2, "requestPhone"); return (Criteria) this; } + // 判断requestPhone是否不在某个范围内 public Criteria andRequestPhoneNotBetween(String value1, String value2) { addCriterion("request_phone not between", value1, value2, "requestPhone"); return (Criteria) this; } + // 判断requestExpressId是否为空 public Criteria andRequestExpressIdIsNull() { addCriterion("request_express_id is null"); return (Criteria) this; } + // 判断requestExpressId是否不为空 public Criteria andRequestExpressIdIsNotNull() { addCriterion("request_express_id is not null"); return (Criteria) this; } + // 判断requestExpressId是否等于某个值 public Criteria andRequestExpressIdEqualTo(Integer value) { addCriterion("request_express_id =", value, "requestExpressId"); return (Criteria) this; } + // 判断requestExpressId是否不等于某个值 public Criteria andRequestExpressIdNotEqualTo(Integer value) { addCriterion("request_express_id <>", value, "requestExpressId"); return (Criteria) this; } + // 判断requestExpressId是否大于某个值 public Criteria andRequestExpressIdGreaterThan(Integer value) { addCriterion("request_express_id >", value, "requestExpressId"); return (Criteria) this; } + // 判断requestExpressId是否大于等于某个值 public Criteria andRequestExpressIdGreaterThanOrEqualTo(Integer value) { addCriterion("request_express_id >=", value, "requestExpressId"); return (Criteria) this; } + // 判断requestExpressId是否小于某个值 public Criteria andRequestExpressIdLessThan(Integer value) { addCriterion("request_express_id <", value, "requestExpressId"); return (Criteria) this; diff --git a/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java b/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java index c87f627..09bc100 100644 --- a/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java +++ b/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java @@ -5,12 +5,17 @@ import com.xmomen.module.receipt.entity.TbReceivingCodeRequest; import com.xmomen.module.receipt.entity.TbReceivingCodeRequestExample; import org.apache.ibatis.annotations.Param; +// TbReceivingCodeRequestMapper接口，继承MybatisMapper public interface TbReceivingCodeRequestMapper extends MybatisMapper { + // 根据example统计TbReceivingCodeRequest的数量 int countByExample(TbReceivingCodeRequestExample example); + // 根据example删除TbReceivingCodeRequest int deleteByExample(TbReceivingCodeRequestExample example); + // 插入TbReceivingCodeRequest int insertSelective(TbReceivingCodeRequest record); + // 根据example更新TbReceivingCodeRequest int updateByExampleSelective(@Param("record") TbReceivingCodeRequest record, @Param("example") TbReceivingCodeRequestExample example); } \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java index 9c4fbfb..144a6ec 100644 --- a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java @@ -1,6 +1,8 @@ package com.xmomen.module.receipt.mapper; +// 定义一个接口ReceivingCodeRequestMapper public interface ReceivingCodeRequestMapper { + // 定义一个常量ReceivingCodeRequestMapperNameSpace，值为"com.xmomen.module.receipt.mapper.ReceivingCodeRequestMapper." public static final String ReceivingCodeRequestMapperNameSpace = "com.xmomen.module.receipt.mapper.ReceivingCodeRequestMapper."; } diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml index 10b75ea..4233e49 100644 --- a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml @@ -14,13 +14,16 @@ left join tb_order_ref receiving_code on receiving_code.order_no = main.order_no and receiving_code.ref_type = 'SHOU_HUO_NO' left join tb_order tborder on tborder.order_no = main.order_no + AND main.request_phone LIKE CONCAT('%', #{keyword}, '%') or main.request_user LIKE CONCAT('%', #{keyword}, '%') + AND main.order_no LIKE CONCAT('%', #{orderNo}, '%') + = #{requestTimeStart} diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java index e383771..6c4ddd9 100644 --- a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java @@ -1,9 +1,9 @@ package com.xmomen.module.receipt.mapper; -/** - * Created by Jeng on 16/4/13. - */ + +// 定义一个接口，用于操作退货订单 public interface ReturnOrderMapper { + // 定义一个常量，用于命名空间 public static final String RETURN_ORDER_MAPPER_NAMESPACE = "com.xmomen.module.receipt.mapper.ReturnOrderMapper."; } diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml index 0fe8ea6..627b5b5 100644 --- a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml @@ -1,8 +1,7 @@ - - +