szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: 订单维护

This commit is contained in:
Damonny 2024-12-29 13:54:19 +08:00
parent c9460836d3
commit a76700b92e
6 changed files with 460 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java
View File

@ -15,79 +15,76 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@ToString(callSuper = true)
public class OrdersPageReqVO extends PageParam {
@Schema(description = "供应商-商品名称", example = "芋艿")
private String supplierProductName;
@Schema(description = "订单ID", example = "5205")
private Long id;
@Schema(description = "供应商-商品编码SKU")
@Schema(description = "商品编码")
private String supplierProductSku;
@Schema(description = "外部订单编号", example = "1396")
private String sourceId;
@Schema(description = "订单来源")
private String source;
@Schema(description = "产品SKU")
private String productSku;
@Schema(description = "用户下单时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] orderedAt;
@Schema(description = "外部SKU")
private String sourceSku;
@Schema(description = "生产时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] producedAt;
@Schema(description = "证件号码")
@Schema(description = "生产号码")
private String planMobileProduced;
@Schema(description = "激活时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] activatedAt;
@Schema(description = "身份证号")
private String idCardNum;
@Schema(description = "充值时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] rechargedAt;
@Schema(description = "卖家备注", example = "你猜")
private String memo;
@Schema(description = "数量")
private String amount;
@Schema(description = "状态变更时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] statusUpdatedAt;
@Schema(description = "交易状态", example = "2")
private String refundStatus;
@Schema(description = "激活状态", example = "2")
private String activeStatus;
@Schema(description = "ICCID", example = "3384")
private String iccid;
@Schema(description = "外部订单编号", example = "3091")
private String realSourceId;
@Schema(description = "收件人电话")
private String addressMobile;
@Schema(description = "物流单号")
private String trackingNumber;
@Schema(description = "订单状态码", example = "1")
private Long status;
@Schema(description = "标志")
private Long flag;
@Schema(description = "订单来源")
private String source;
@Schema(description = "用户下单时间")
private LocalDateTime orderedAt;
@Schema(description = "生产时间")
private LocalDateTime producedAt;
@Schema(description = "发货时间")
private LocalDateTime deliveredAt;
@Schema(description = "激活时间")
private LocalDateTime activatedAt;
@Schema(description = "充值时间")
private LocalDateTime rechargedAt;
@Schema(description = "状态变更时间")
private LocalDateTime statusUpdatedAt;
@Schema(description = "退款状态", example = "1")
private String refundStatus;
@Schema(description = "激活状态", example = "1")
private String activeStatus;
@Schema(description = "ICCID", example = "2781")
private String iccid;
@Schema(description = "真实外部订单编号", example = "25683")
private String realSourceId;
@Schema(description = "分销商名称", example = "王五")
@Schema(description = "供应商", example = "王五")
private String merchantName;
@Schema(description = "上游状态", example = "2")
private String upStatus;
@Schema(description = "订单状态", example = "1")
private Long status;
@Schema(description = "上游订单号", example = "21235")
private String upstreamOrderId;
@Schema(description = "标旗")
private Long flag;
@Schema(description = "订单状态名称", example = "王五")
private String statusName;
@Schema(description = "平台创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

261
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersRespVO.java
View File

@ -6,237 +6,244 @@ import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
@Schema(description = "管理后台 - 订单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class OrdersRespVO {
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12955")
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5205")
@ExcelProperty("订单ID")
private Long id;
@Schema(description = "生产商ID", example = "15873")
@Schema(description = "生产商ID", example = "15511")
@ExcelProperty("生产商ID")
private Long producerId;
@Schema(description = "产品ID", example = "14115")
@ExcelProperty("产品ID")
private Long productId;
@Schema(description = "供应商-商品名称", example = "芋艿")
@ExcelProperty("供应商-商品名称")
@Schema(description = "商品名称", example = "张三")
@ExcelProperty("商品名称")
private String supplierProductName;
@Schema(description = "供应商-商品编码SKU")
@ExcelProperty("供应商-商品编码SKU")
@Schema(description = "商品编码")
@ExcelProperty("商品编码")
private String supplierProductSku;
@Schema(description = "外部订单编号", example = "1396")
@Schema(description = "外部订单编号", example = "2357")
@ExcelProperty("外部订单编号")
private String sourceId;
@Schema(description = "分享ID", example = "26263")
@ExcelProperty("分享ID")
private Long shareId;
@Schema(description = "用户ID", example = "31769")
@ExcelProperty("用户ID")
private Long userId;
@Schema(description = "产品SKU")
@ExcelProperty("产品SKU")
private String productSku;
@Schema(description = "外部SKU")
@ExcelProperty("外部SKU")
private String sourceSku;
@Schema(description = "计划手机号")
@ExcelProperty("计划手机号")
private String planMobile;
@Schema(description = "生产手机号")
@ExcelProperty("生产手机号")
private String planMobileProduced;
@Schema(description = "证件姓名", example = "李四")
@ExcelProperty("证件姓名")
private String idCardName;
@Schema(description = "证件号码")
@ExcelProperty("证件号码")
private String idCardNum;
@Schema(description = "地址省编码")
@ExcelProperty("地址省编码")
private String addressProvinceCode;
@Schema(description = "地址市编码")
@ExcelProperty("地址市编码")
private String addressCityCode;
@Schema(description = "地址区编码")
@ExcelProperty("地址区编码")
private String addressDistrictCode;
@Schema(description = "地址省")
@ExcelProperty("地址省")
private String addressProvince;
@Schema(description = "地址市")
@ExcelProperty("地址市")
private String addressCity;
@Schema(description = "地址区")
@ExcelProperty("地址区")
private String addressDistrict;
@Schema(description = "详细地址")
@ExcelProperty("详细地址")
private String address;
@Schema(description = "收件人电话")
@ExcelProperty("收件人电话")
private String addressMobile;
@Schema(description = "收件人姓名", example = "李四")
@ExcelProperty("收件人姓名")
private String addressName;
@Schema(description = "物流公司ID", example = "29667")
@ExcelProperty("物流公司ID")
private Long trackingCompanyId;
@Schema(description = "物流单号")
@ExcelProperty("物流单号")
private String trackingNumber;
@Schema(description = "买家备注", example = "你说的对")
@ExcelProperty("买家备注")
private String buyerMemo;
@Schema(description = "卖家备注", example = "随便")
@ExcelProperty("卖家备注")
private String sellerMemo;
@Schema(description = "生产备注", example = "你猜")
@ExcelProperty("生产备注")
private String producerMemo;
@Schema(description = "订单状态码", example = "1")
@ExcelProperty("订单状态码")
private Long status;
@Schema(description = "标志")
@ExcelProperty("标志")
private Long flag;
@Schema(description = "预警区域")
@ExcelProperty("预警区域")
private String warnArea;
@Schema(description = "原因", example = "不对")
@ExcelProperty("原因")
private String reason;
@Schema(description = "分享ID", example = "26263")
@ExcelProperty("分享ID")
private Long shareId;
@Schema(description = "订单来源")
@ExcelProperty("订单来源")
@ExcelProperty(value = "订单来源", converter = DictConvert.class)
@DictFormat("haoka_order_channel") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private String source;
@Schema(description = "用户ID", example = "31769")
@ExcelProperty("用户ID")
private Long userId;
@Schema(description = "产品ID", example = "24383")
@ExcelProperty("产品ID")
private Long productId;
@Schema(description = "产品编码")
@ExcelProperty("产品编码")
private String productSku;
@Schema(description = "用户下单时间")
@ExcelProperty("用户下单时间")
private LocalDateTime orderedAt;
@Schema(description = "购买号码")
@ExcelProperty("购买号码")
private String planMobile;
@Schema(description = "生产时间")
@ExcelProperty("生产时间")
private LocalDateTime producedAt;
@Schema(description = "生产号码")
@ExcelProperty("生产号码")
private String planMobileProduced;
@Schema(description = "发货时间")
@ExcelProperty("发货时间")
private LocalDateTime deliveredAt;
@Schema(description = "证件姓名", example = "李四")
@ExcelProperty("证件姓名")
private String idCardName;
@Schema(description = "激活时间")
@ExcelProperty("激活时间")
private LocalDateTime activatedAt;
@Schema(description = "身份证号")
@ExcelProperty("身份证号")
private String idCardNum;
@Schema(description = "充值时间")
@ExcelProperty("充值时间")
private LocalDateTime rechargedAt;
@Schema(description = "地址省编码")
@ExcelProperty("地址省编码")
private String addressProvinceCode;
@Schema(description = "卖家备注", example = "你猜")
@ExcelProperty("卖家备注")
private String memo;
@Schema(description = "地址市编码")
@ExcelProperty("地址市编码")
private String addressCityCode;
@Schema(description = "数量")
@ExcelProperty("数量")
private String amount;
@Schema(description = "地址区编码")
@ExcelProperty("地址区编码")
private String addressDistrictCode;
@Schema(description = "状态变更时间")
@ExcelProperty("状态变更时间")
private LocalDateTime statusUpdatedAt;
@Schema(description = "退款状态", example = "1")
@ExcelProperty("退款状态")
@Schema(description = "地址省")
@ExcelProperty("地址省")
private String addressProvince;
@Schema(description = "交易状态", example = "2")
@ExcelProperty(value = "交易状态", converter = DictConvert.class)
@DictFormat("pay_refund_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private String refundStatus;
@Schema(description = "激活状态", example = "1")
@ExcelProperty("激活状态")
@Schema(description = "地址市")
@ExcelProperty("地址市")
private String addressCity;
@Schema(description = "激活状态", example = "2")
@ExcelProperty(value = "激活状态", converter = DictConvert.class)
@DictFormat("haoka_order_active_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private String activeStatus;
@Schema(description = "ICCID", example = "2781")
@Schema(description = "地址区")
@ExcelProperty("地址区")
private String addressDistrict;
@Schema(description = "ICCID", example = "3384")
@ExcelProperty("ICCID")
private String iccid;
@Schema(description = "真实外部订单编号", example = "25683")
@ExcelProperty("真实外部订单编号")
@Schema(description = "详细地址")
@ExcelProperty("详细地址")
private String address;
@Schema(description = "外部订单编号", example = "3091")
@ExcelProperty("外部订单编号")
private String realSourceId;
@Schema(description = "收件人电话")
@ExcelProperty("收件人电话")
private String addressMobile;
@Schema(description = "图片大小")
@ExcelProperty("图片大小")
private Long picSize;
@Schema(description = "收件人姓名", example = "李四")
@ExcelProperty("收件人姓名")
private String addressName;
@Schema(description = "归属地省")
@ExcelProperty("归属地省")
private String regionP;
@Schema(description = "物流公司ID", example = "29667")
@ExcelProperty("物流公司ID")
private Long trackingCompanyId;
@Schema(description = "归属地市")
@ExcelProperty("归属地市")
private String regionC;
@Schema(description = "分销商名称", example = "王五")
@ExcelProperty("分销商名称")
@Schema(description = "物流单号")
@ExcelProperty("物流单号")
private String trackingNumber;
@Schema(description = "供应商", example = "王五")
@ExcelProperty("供应商")
private String merchantName;
@Schema(description = "上游状态", example = "2")
@Schema(description = "买家备注", example = "你说的对")
@ExcelProperty("买家备注")
private String buyerMemo;
@Schema(description = "上游状态", example = "1")
@ExcelProperty("上游状态")
private String upStatus;
@Schema(description = "上游订单号", example = "21235")
@Schema(description = "卖家备注", example = "随便")
@ExcelProperty("卖家备注")
private String sellerMemo;
@Schema(description = "上游订单号", example = "27223")
@ExcelProperty("上游订单号")
private String upstreamOrderId;
@Schema(description = "生产备注", example = "你猜")
@ExcelProperty("生产备注")
private String producerMemo;
@Schema(description = "镇/乡")
@ExcelProperty("镇/乡")
private String town;
@Schema(description = "订单状态", example = "1")
@ExcelProperty(value = "订单状态", converter = DictConvert.class)
@DictFormat("haoka_order_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private Long status;
@Schema(description = "物流公司名称")
@ExcelProperty("物流公司名称")
private String trackingCompany;
@Schema(description = "订单状态名称", example = "王五")
@Schema(description = "标旗")
@ExcelProperty(value = "标旗", converter = DictConvert.class)
@DictFormat("haoka_order_flag") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private Long flag;
@Schema(description = "订单状态名称", example = "张三")
@ExcelProperty("订单状态名称")
private String statusName;
@Schema(description = "预警区域")
@ExcelProperty("预警区域")
private String warnArea;
@Schema(description = "加密收货电话")
@ExcelProperty("加密收货电话")
private String encryptAddressMobile;
@Schema(description = "加密收货人姓名", example = "赵六")
@Schema(description = "原因", example = "不对")
@ExcelProperty("原因")
private String reason;
@Schema(description = "加密收货人姓名", example = "张三")
@ExcelProperty("加密收货人姓名")
private String encryptAddressName;
@Schema(description = "加密证件姓名", example = "李四")
@Schema(description = "加密证件姓名", example = "赵六")
@ExcelProperty("加密证件姓名")
private String encryptIdCardName;
@ -248,4 +255,8 @@ public class OrdersRespVO {
@ExcelProperty("加密详细地址")
private String encryptAddress;
@Schema(description = "平台创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("平台创建时间")
private LocalDateTime createTime;
}

184
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java
View File

@ -11,175 +11,175 @@ import java.time.LocalDateTime;
@Data
public class OrdersSaveReqVO {
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12955")
@Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5205")
private Long id;
@Schema(description = "生产商ID", example = "15873")
@Schema(description = "生产商ID", example = "15511")
private Long producerId;
@Schema(description = "产品ID", example = "14115")
private Long productId;
@Schema(description = "供应商-商品名称", example = "芋艿")
@Schema(description = "商品名称", example = "张三")
private String supplierProductName;
@Schema(description = "供应商-商品编码SKU")
@Schema(description = "商品编码")
private String supplierProductSku;
@Schema(description = "外部订单编号", example = "1396")
@Schema(description = "外部订单编号", example = "2357")
private String sourceId;
@Schema(description = "分享ID", example = "26263")
private Long shareId;
@Schema(description = "用户ID", example = "31769")
private Long userId;
@Schema(description = "产品SKU")
private String productSku;
@Schema(description = "外部SKU")
private String sourceSku;
@Schema(description = "计划手机号")
private String planMobile;
@Schema(description = "生产手机号")
private String planMobileProduced;
@Schema(description = "证件姓名", example = "李四")
private String idCardName;
@Schema(description = "证件号码")
private String idCardNum;
@Schema(description = "地址省编码")
private String addressProvinceCode;
@Schema(description = "地址市编码")
private String addressCityCode;
@Schema(description = "地址区编码")
private String addressDistrictCode;
@Schema(description = "地址省")
private String addressProvince;
@Schema(description = "地址市")
private String addressCity;
@Schema(description = "地址区")
private String addressDistrict;
@Schema(description = "详细地址")
private String address;
@Schema(description = "收件人电话")
private String addressMobile;
@Schema(description = "收件人姓名", example = "李四")
private String addressName;
@Schema(description = "物流公司ID", example = "29667")
private Long trackingCompanyId;
@Schema(description = "物流单号")
private String trackingNumber;
@Schema(description = "买家备注", example = "你说的对")
private String buyerMemo;
@Schema(description = "卖家备注", example = "随便")
private String sellerMemo;
@Schema(description = "生产备注", example = "你猜")
private String producerMemo;
@Schema(description = "订单状态码", example = "1")
private Long status;
@Schema(description = "标志")
private Long flag;
@Schema(description = "预警区域")
private String warnArea;
@Schema(description = "原因", example = "不对")
private String reason;
@Schema(description = "分享ID", example = "26263")
private Long shareId;
@Schema(description = "订单来源")
private String source;
@Schema(description = "用户ID", example = "31769")
private Long userId;
@Schema(description = "产品ID", example = "24383")
private Long productId;
@Schema(description = "产品编码")
private String productSku;
@Schema(description = "用户下单时间")
private LocalDateTime orderedAt;
@Schema(description = "购买号码")
private String planMobile;
@Schema(description = "生产时间")
private LocalDateTime producedAt;
@Schema(description = "生产号码")
private String planMobileProduced;
@Schema(description = "发货时间")
private LocalDateTime deliveredAt;
@Schema(description = "证件姓名", example = "李四")
private String idCardName;
@Schema(description = "激活时间")
private LocalDateTime activatedAt;
@Schema(description = "身份证号")
private String idCardNum;
@Schema(description = "充值时间")
private LocalDateTime rechargedAt;
@Schema(description = "地址省编码")
private String addressProvinceCode;
@Schema(description = "卖家备注", example = "你猜")
private String memo;
@Schema(description = "地址市编码")
private String addressCityCode;
@Schema(description = "数量")
private String amount;
@Schema(description = "地址区编码")
private String addressDistrictCode;
@Schema(description = "状态变更时间")
private LocalDateTime statusUpdatedAt;
@Schema(description = "退款状态", example = "1")
@Schema(description = "地址省")
private String addressProvince;
@Schema(description = "交易状态", example = "2")
private String refundStatus;
@Schema(description = "激活状态", example = "1")
@Schema(description = "地址市")
private String addressCity;
@Schema(description = "激活状态", example = "2")
private String activeStatus;
@Schema(description = "ICCID", example = "2781")
@Schema(description = "地址区")
private String addressDistrict;
@Schema(description = "ICCID", example = "3384")
private String iccid;
@Schema(description = "真实外部订单编号", example = "25683")
@Schema(description = "详细地址")
private String address;
@Schema(description = "外部订单编号", example = "3091")
private String realSourceId;
@Schema(description = "收件人电话")
private String addressMobile;
@Schema(description = "图片大小")
private Long picSize;
@Schema(description = "收件人姓名", example = "李四")
private String addressName;
@Schema(description = "归属地省")
private String regionP;
@Schema(description = "物流公司ID", example = "29667")
private Long trackingCompanyId;
@Schema(description = "归属地市")
private String regionC;
@Schema(description = "分销商名称", example = "王五")
@Schema(description = "物流单号")
private String trackingNumber;
@Schema(description = "供应商", example = "王五")
private String merchantName;
@Schema(description = "上游状态", example = "2")
@Schema(description = "买家备注", example = "你说的对")
private String buyerMemo;
@Schema(description = "上游状态", example = "1")
private String upStatus;
@Schema(description = "上游订单号", example = "21235")
@Schema(description = "卖家备注", example = "随便")
private String sellerMemo;
@Schema(description = "上游订单号", example = "27223")
private String upstreamOrderId;
@Schema(description = "生产备注", example = "你猜")
private String producerMemo;
@Schema(description = "镇/乡")
private String town;
@Schema(description = "订单状态", example = "1")
private Long status;
@Schema(description = "物流公司名称")
private String trackingCompany;
@Schema(description = "订单状态名称", example = "王五")
@Schema(description = "标旗")
private Long flag;
@Schema(description = "订单状态名称", example = "张三")
private String statusName;
@Schema(description = "预警区域")
private String warnArea;
@Schema(description = "加密收货电话")
private String encryptAddressMobile;
@Schema(description = "加密收货人姓名", example = "赵六")
@Schema(description = "原因", example = "不对")
private String reason;
@Schema(description = "加密收货人姓名", example = "张三")
private String encryptAddressName;
@Schema(description = "加密证件姓名", example = "李四")
@Schema(description = "加密证件姓名", example = "赵六")
private String encryptIdCardName;
@Schema(description = "加密证件号码")

224
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/orders/OrdersDO.java
View File

@ -8,6 +8,8 @@ import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -36,217 +38,227 @@ public class OrdersDO extends BaseDO {
*/
private Long producerId;
/**
* 产品ID
*/
private Long productId;
/**
* 供应商-商品名称
* 商品名称
*/
private String supplierProductName;
/**
* 供应商-商品编码SKU
* 商品编码
*/
private String supplierProductSku;
/**
* 外部订单编号
*/
private String sourceId;
/**
* 外部SKU
*/
private String sourceSku;
/**
* 分享ID
*/
private Long shareId;
/**
* 订单来源
*
* 枚举 {@link TODO haoka_order_channel 对应的类}
*/
private String source;
/**
* 用户ID
*/
private Long userId;
/**
* 产品SKU
* 产品ID
*/
private Long productId;
/**
* 产品编码
*/
private String productSku;
/**
* 外部SKU
*/
private String sourceSku;
/**
* 计划手机号
*/
private String planMobile;
/**
* 生产手机号
*/
private String planMobileProduced;
/**
* 证件姓名
*/
private String idCardName;
/**
* 证件号码
*/
private String idCardNum;
/**
* 地址省编码
*/
private String addressProvinceCode;
/**
* 地址市编码
*/
private String addressCityCode;
/**
* 地址区编码
*/
private String addressDistrictCode;
/**
* 地址省
*/
private String addressProvince;
/**
* 地址市
*/
private String addressCity;
/**
* 地址区
*/
private String addressDistrict;
/**
* 详细地址
*/
private String address;
/**
* 收件人电话
*/
private String addressMobile;
/**
* 收件人姓名
*/
private String addressName;
/**
* 物流公司ID
*/
private Long trackingCompanyId;
/**
* 物流单号
*/
private String trackingNumber;
/**
* 买家备注
*/
private String buyerMemo;
/**
* 卖家备注
*/
private String sellerMemo;
/**
* 生产备注
*/
private String producerMemo;
/**
* 订单状态码
*/
private Long status;
/**
* 标志
*/
private Long flag;
/**
* 预警区域
*/
private String warnArea;
/**
* 原因
*/
private String reason;
/**
* 订单来源
*/
private String source;
/**
* 用户下单时间
*/
private LocalDateTime orderedAt;
/**
* 购买号码
*/
private String planMobile;
/**
* 生产时间
*/
private LocalDateTime producedAt;
/**
* 生产号码
*/
private String planMobileProduced;
/**
* 发货时间
*/
private LocalDateTime deliveredAt;
/**
* 证件姓名
*/
private String idCardName;
/**
* 激活时间
*/
private LocalDateTime activatedAt;
/**
* 身份证号
*/
private String idCardNum;
/**
* 充值时间
*/
private LocalDateTime rechargedAt;
/**
* 地址省编码
*/
private String addressProvinceCode;
/**
* 卖家备注
*/
private String memo;
/**
* 地址市编码
*/
private String addressCityCode;
/**
* 数量
*/
private String amount;
/**
* 地址区编码
*/
private String addressDistrictCode;
/**
* 状态变更时间
*/
private LocalDateTime statusUpdatedAt;
/**
* 退款状态
* 地址省
*/
private String addressProvince;
/**
* 交易状态
*
* 枚举 {@link TODO pay_refund_status 对应的类}
*/
private String refundStatus;
/**
* 地址市
*/
private String addressCity;
/**
* 激活状态
*
* 枚举 {@link TODO haoka_order_active_status 对应的类}
*/
private String activeStatus;
/**
* 地址区
*/
private String addressDistrict;
/**
* ICCID
*/
private String iccid;
/**
* 真实外部订单编号
* 详细地址
*/
private String address;
/**
* 外部订单编号
*/
private String realSourceId;
/**
* 收件人电话
*/
private String addressMobile;
/**
* 图片大小
*/
private Long picSize;
/**
* 收件人姓名
*/
private String addressName;
/**
* 归属地省
*/
private String regionP;
/**
* 物流公司ID
*/
private Long trackingCompanyId;
/**
* 归属地市
*/
private String regionC;
/**
* 分销商名称
* 物流单号
*/
private String trackingNumber;
/**
* 供应商
*/
private String merchantName;
/**
* 买家备注
*/
private String buyerMemo;
/**
* 上游状态
*/
private String upStatus;
/**
* 卖家备注
*/
private String sellerMemo;
/**
* 上游订单号
*/
private String upstreamOrderId;
/**
* 生产备注
*/
private String producerMemo;
/**
* 镇/乡
*/
private String town;
/**
* 订单状态
*
* 枚举 {@link TODO haoka_order_status 对应的类}
*/
private Long status;
/**
* 物流公司名称
*/
private String trackingCompany;
/**
* 标旗
*
* 枚举 {@link TODO haoka_order_flag 对应的类}
*/
private Long flag;
/**
* 订单状态名称
*/
private String statusName;
/**
* 预警区域
*/
private String warnArea;
/**
* 加密收货电话
*/
private String encryptAddressMobile;
/**
* 原因
*/
private String reason;
/**
* 加密收货人姓名
*/

35
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
View File

@ -19,31 +19,28 @@ public interface OrdersMapper extends BaseMapperX<OrdersDO> {
default PageResult<OrdersDO> selectPage(OrdersPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<OrdersDO>()
.likeIfPresent(OrdersDO::getSupplierProductName, reqVO.getSupplierProductName())
.eqIfPresent(OrdersDO::getSupplierProductSku, reqVO.getSupplierProductSku())
.eqIfPresent(OrdersDO::getSourceId, reqVO.getSourceId())
.eqIfPresent(OrdersDO::getProductSku, reqVO.getProductSku())
.eqIfPresent(OrdersDO::getSourceSku, reqVO.getSourceSku())
.eqIfPresent(OrdersDO::getIdCardNum, reqVO.getIdCardNum())
.eqIfPresent(OrdersDO::getAddressMobile, reqVO.getAddressMobile())
.eqIfPresent(OrdersDO::getTrackingNumber, reqVO.getTrackingNumber())
.eqIfPresent(OrdersDO::getStatus, reqVO.getStatus())
.eqIfPresent(OrdersDO::getFlag, reqVO.getFlag())
.eqIfPresent(OrdersDO::getId, reqVO.getId())
.likeIfPresent(OrdersDO::getSupplierProductSku, reqVO.getSupplierProductSku())
.eqIfPresent(OrdersDO::getSource, reqVO.getSource())
.eqIfPresent(OrdersDO::getOrderedAt, reqVO.getOrderedAt())
.eqIfPresent(OrdersDO::getProducedAt, reqVO.getProducedAt())
.eqIfPresent(OrdersDO::getDeliveredAt, reqVO.getDeliveredAt())
.eqIfPresent(OrdersDO::getActivatedAt, reqVO.getActivatedAt())
.eqIfPresent(OrdersDO::getRechargedAt, reqVO.getRechargedAt())
.eqIfPresent(OrdersDO::getStatusUpdatedAt, reqVO.getStatusUpdatedAt())
.betweenIfPresent(OrdersDO::getOrderedAt, reqVO.getOrderedAt())
.betweenIfPresent(OrdersDO::getProducedAt, reqVO.getProducedAt())
.eqIfPresent(OrdersDO::getPlanMobileProduced, reqVO.getPlanMobileProduced())
.betweenIfPresent(OrdersDO::getActivatedAt, reqVO.getActivatedAt())
.eqIfPresent(OrdersDO::getIdCardNum, reqVO.getIdCardNum())
.betweenIfPresent(OrdersDO::getRechargedAt, reqVO.getRechargedAt())
.eqIfPresent(OrdersDO::getMemo, reqVO.getMemo())
.eqIfPresent(OrdersDO::getAmount, reqVO.getAmount())
.betweenIfPresent(OrdersDO::getStatusUpdatedAt, reqVO.getStatusUpdatedAt())
.eqIfPresent(OrdersDO::getRefundStatus, reqVO.getRefundStatus())
.eqIfPresent(OrdersDO::getActiveStatus, reqVO.getActiveStatus())
.eqIfPresent(OrdersDO::getIccid, reqVO.getIccid())
.eqIfPresent(OrdersDO::getRealSourceId, reqVO.getRealSourceId())
.eqIfPresent(OrdersDO::getAddressMobile, reqVO.getAddressMobile())
.eqIfPresent(OrdersDO::getTrackingNumber, reqVO.getTrackingNumber())
.likeIfPresent(OrdersDO::getMerchantName, reqVO.getMerchantName())
.eqIfPresent(OrdersDO::getUpStatus, reqVO.getUpStatus())
.eqIfPresent(OrdersDO::getUpstreamOrderId, reqVO.getUpstreamOrderId())
.likeIfPresent(OrdersDO::getStatusName, reqVO.getStatusName())
.eqIfPresent(OrdersDO::getStatus, reqVO.getStatus())
.eqIfPresent(OrdersDO::getFlag, reqVO.getFlag())
.betweenIfPresent(OrdersDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(OrdersDO::getId));
}

102
yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImplTest.java
View File

@ -110,65 +110,52 @@ public class OrdersServiceImplTest extends BaseDbUnitTest {
public void testGetOrdersPage() {
// mock 数据
OrdersDO dbOrders = randomPojo(OrdersDO.class, o -> { // 等会查询到
o.setSupplierProductName(null);
o.setId(null);
o.setSupplierProductSku(null);
o.setSourceId(null);
o.setProductSku(null);
o.setSourceSku(null);
o.setIdCardNum(null);
o.setAddressMobile(null);
o.setTrackingNumber(null);
o.setStatus(null);
o.setFlag(null);
o.setSource(null);
o.setOrderedAt(null);
o.setProducedAt(null);
o.setDeliveredAt(null);
o.setPlanMobileProduced(null);
o.setActivatedAt(null);
o.setIdCardNum(null);
o.setRechargedAt(null);
o.setMemo(null);
o.setAmount(null);
o.setStatusUpdatedAt(null);
o.setRefundStatus(null);
o.setActiveStatus(null);
o.setIccid(null);
o.setRealSourceId(null);
o.setAddressMobile(null);
o.setTrackingNumber(null);
o.setMerchantName(null);
o.setUpStatus(null);
o.setUpstreamOrderId(null);
o.setStatusName(null);
o.setStatus(null);
o.setFlag(null);
o.setCreateTime(null);
});
ordersMapper.insert(dbOrders);
// 测试 supplierProductName 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setSupplierProductName(null)));
// 测试 id 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setId(null)));
// 测试 supplierProductSku 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setSupplierProductSku(null)));
// 测试 sourceId 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setSourceId(null)));
// 测试 productSku 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setProductSku(null)));
// 测试 sourceSku 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setSourceSku(null)));
// 测试 idCardNum 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setIdCardNum(null)));
// 测试 addressMobile 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setAddressMobile(null)));
// 测试 trackingNumber 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setTrackingNumber(null)));
// 测试 status 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setStatus(null)));
// 测试 flag 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setFlag(null)));
// 测试 source 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setSource(null)));
// 测试 orderedAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setOrderedAt(null)));
// 测试 producedAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setProducedAt(null)));
// 测试 deliveredAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setDeliveredAt(null)));
// 测试 planMobileProduced 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setPlanMobileProduced(null)));
// 测试 activatedAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setActivatedAt(null)));
// 测试 idCardNum 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setIdCardNum(null)));
// 测试 rechargedAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setRechargedAt(null)));
// 测试 memo 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setMemo(null)));
// 测试 amount 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setAmount(null)));
// 测试 statusUpdatedAt 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setStatusUpdatedAt(null)));
// 测试 refundStatus 不匹配
@ -179,41 +166,42 @@ public class OrdersServiceImplTest extends BaseDbUnitTest {
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setIccid(null)));
// 测试 realSourceId 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setRealSourceId(null)));
// 测试 addressMobile 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setAddressMobile(null)));
// 测试 trackingNumber 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setTrackingNumber(null)));
// 测试 merchantName 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setMerchantName(null)));
// 测试 upStatus 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setUpStatus(null)));
// 测试 upstreamOrderId 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setUpstreamOrderId(null)));
// 测试 statusName 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setStatusName(null)));
// 测试 status 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setStatus(null)));
// 测试 flag 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setFlag(null)));
// 测试 createTime 不匹配
ordersMapper.insert(cloneIgnoreId(dbOrders, o -> o.setCreateTime(null)));
// 准备参数
OrdersPageReqVO reqVO = new OrdersPageReqVO();
reqVO.setSupplierProductName(null);
reqVO.setId(null);
reqVO.setSupplierProductSku(null);
reqVO.setSourceId(null);
reqVO.setProductSku(null);
reqVO.setSourceSku(null);
reqVO.setIdCardNum(null);
reqVO.setAddressMobile(null);
reqVO.setTrackingNumber(null);
reqVO.setStatus(null);
reqVO.setFlag(null);
reqVO.setSource(null);
reqVO.setOrderedAt(null);
reqVO.setProducedAt(null);
reqVO.setDeliveredAt(null);
reqVO.setActivatedAt(null);
reqVO.setRechargedAt(null);
reqVO.setStatusUpdatedAt(null);
reqVO.setOrderedAt(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setProducedAt(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setPlanMobileProduced(null);
reqVO.setActivatedAt(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setIdCardNum(null);
reqVO.setRechargedAt(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setMemo(null);
reqVO.setAmount(null);
reqVO.setStatusUpdatedAt(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setRefundStatus(null);
reqVO.setActiveStatus(null);
reqVO.setIccid(null);
reqVO.setRealSourceId(null);
reqVO.setAddressMobile(null);
reqVO.setTrackingNumber(null);
reqVO.setMerchantName(null);
reqVO.setUpStatus(null);
reqVO.setUpstreamOrderId(null);
reqVO.setStatusName(null);
reqVO.setStatus(null);
reqVO.setFlag(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<OrdersDO> pageResult = ordersService.getOrdersPage(reqVO);