github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapt ShoumanOrderContent to the fact that now multiple regexes can exist

pull/8040/head
Qiuyi LI 2024-08-01 17:34:10 +02:00
parent dcc862b25d
commit 983d86580e
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/ShoumanOrderContent.java
View File

@ -3,6 +3,7 @@ package org.jeecg.modules.business.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class ShoumanOrderContent {
@ -19,34 +20,12 @@ public class ShoumanOrderContent {
private Integer quantity;
private String productName;
private String remark;
private String contentRecRegex;
private String contentExtRegex;
private BigDecimal price;
private String imageUrl;
private String sku;
private List<ShoumanRegex> regexList;
public ShoumanOrderContent(String shopErpCode, String platformOrderId, String platformOrderNumber, String postcode,
String recipient, String city, String country, String platformOrderContentId,
String customizationData, Integer quantity, String productName, String remark,
String contentRecRegex, String contentExtRegex, BigDecimal price, String imageUrl,
String sku) {
this.shopErpCode = shopErpCode;
this.platformOrderId = platformOrderId;
this.platformOrderNumber = platformOrderNumber;
this.postcode = postcode;
this.recipient = recipient;
this.city = city;
this.country = country;
this.platformOrderContentId = platformOrderContentId;
this.customizationData = customizationData;
this.quantity = quantity;
this.productName = productName;
this.remark = remark;
this.contentRecRegex = contentRecRegex;
this.contentExtRegex = contentExtRegex;
this.price = price;
this.imageUrl = imageUrl;
this.sku = sku;
public ShoumanOrderContent() {
}
@Override
@ -64,11 +43,10 @@ public class ShoumanOrderContent {
", quantity=" + quantity +
", productName='" + productName + '\'' +
", remark='" + remark + '\'' +
", contentRecRegex='" + contentRecRegex + '\'' +
", contentExtRegex='" + contentExtRegex + '\'' +
", price=" + price +
", imageUrl='" + imageUrl + '\'' +
", sku='" + sku + '\'' +
", regexList='" + regexList + '\'' +
'}';
}
}

23
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
View File

@ -361,7 +361,7 @@
</select>
<select id="searchShoumanOrderContent"
resultType="org.jeecg.modules.business.entity.ShoumanOrderContent">
resultType="org.jeecg.modules.business.entity.ShoumanOrderContent" resultMap="shoumanOrderContentResultMap">
select sh.erp_code,
po.platform_order_id,
po.platform_order_number,
@ -374,18 +374,23 @@
poc.quantity,
sc.product_name,
ssr.remark,
sc.content_rec_regex,
sc.content_ext_regex,
sc.price,
sc.image_url,
sc.sku
sc.sku,
sr.content_rec_regex,
sr.content_ext_regex,
sr.prefix,
sr.is_size_regex
from platform_order_content poc
join platform_order po on poc.platform_order_id = po.id
join shop sh on po.shop_id = sh.id
join sku s on poc.sku_id = s.id
join shouman_sku_relation ssr on s.id = ssr.sku_id
join shouman_category sc on ssr.shouman_category_id = sc.id
where poc.erp_status = 1 and po.platform_order_id not in (select platform_order_id from shouman_order);
join shouman_regex sr on sc.id = sr.shouman_category_id
where poc.erp_status = 1
and sr.is_active = 1
and po.platform_order_id not in (select platform_order_id from shouman_order);
</select>
<resultMap id="shoumanOrderContentResultMap" type="org.jeecg.modules.business.entity.ShoumanOrderContent">
@ -401,10 +406,14 @@
<result property="quantity" column="quantity"/>
<result property="productName" column="product_name" javaType="string"/>
<result property="remark" column="remark" javaType="string"/>
<result property="contentRecRegex" column="content_rec_regex" javaType="string"/>
<result property="contentExtRegex" column="content_ext_regex" javaType="string"/>
<result property="price" column="price"/>
<result property="imageUrl" column="image_url" javaType="string"/>
<result property="sku" column="sku" javaType="string"/>
<collection property="regexList" ofType="org.jeecg.modules.business.entity.ShoumanRegex">
<result property="contentRecRegex" column="content_rec_regex" javaType="string"/>
<result property="contentExtRegex" column="content_ext_regex" javaType="string"/>
<result property="prefix" column="prefix" javaType="string"/>
<result property="isSizeRegex" column="is_size_regex" javaType="string"/>
</collection>
</resultMap>
</mapper>