Merge pull request #33 from LQYBill/release

Release 1.6.2

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/Order.java

@@ -126,14 +126,14 @@ public class Order {
     private String phone1;
 
     public void setTrackingNumber(String trackingNumber) {
-        if (trackingNumber != null && trackingNumber.length() == 0) {
+        if (trackingNumber != null && trackingNumber.isEmpty()) {
             this.trackingNumber = null;
         } else
             this.trackingNumber = trackingNumber;
     }
 
     public void setTrackingNumber1(String trackingNumber) {
-        if (trackingNumber != null && trackingNumber.length() == 0) {
+        if (trackingNumber != null && trackingNumber.isEmpty()) {
             this.trackingNumber1 = null;
         } else
             this.trackingNumber1 = trackingNumber;
@@ -164,7 +164,7 @@ public class Order {
     }
 
     public void setShippingTime(String shippingTime) {
-        if (shippingTime != null && shippingTime.length() == 0) {
+        if (shippingTime != null && shippingTime.isEmpty()) {
             this.shippingTime = null;
         } else
             this.shippingTime = shippingTime;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderItem.java

@@ -34,6 +34,9 @@ public class OrderItem {
 
     private String productAvailable;
 
+    @JSONField(name = "specifics")
+    private String specifics;
+
     /**
      * Status :
      * 2 = Normal

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PlatformOrderContent.java

@@ -18,10 +18,10 @@ import java.util.Objects;
 /**
  * @Description: 平台订单内容
  * @Author: jeecg-boot
- * @Date: 2023-02-09
- * @Version: V1.3
+ * @Date: 2023-08-18
+ * @Version: V1.4
  */
-@ApiModel(value = "platform_order对象", description = "平台订单表")
+@ApiModel(value = "platform_order_content对象", description = "平台订单内容")
 @Data
 @TableName("platform_order_content")
 public class PlatformOrderContent implements Serializable {
@@ -127,6 +127,13 @@ public class PlatformOrderContent implements Serializable {
     @Excel(name = "海外仓操作费", width = 15)
     @ApiModelProperty(value = "海外仓操作费")
     private java.math.BigDecimal pickingFee;
+    /**
+     * 商品多属性
+     */
+    @Excel(name = "商品多属性", width = 15)
+    @ApiModelProperty(value = "商品多属性")
+    private java.lang.String customizationData;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml

@@ -189,14 +189,14 @@
         INSERT INTO platform_order_content(
         id, create_by, create_time,
         update_by, update_time, platform_order_id,
-        sku_id, quantity, erp_status, product_available)
+        sku_id, quantity, erp_status, product_available, customization_data)
         VALUES
         <foreach collection="items" separator="," open="" close="" item="item" index="index">
             (
             UUID(), 'Mabang API', NOW(),
             'Mabang API', NOW(), #{item.platformOrderId},
             skuErpToId(#{item.erpCode}), #{item.quantity}, #{item.erpStatus},
-            #{item.productAvailable})
+            #{item.productAvailable}, #{item.specifics})
         </foreach>
     </insert>
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/EmailServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.service.impl;
 
+import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.cache.TemplateLoader;
 import freemarker.template.Configuration;
@@ -66,11 +67,9 @@ public class EmailServiceImpl implements EmailService {
     }
     @Override
     @Transactional
-    public FreeMarkerConfigurer freemarkerClassLoaderConfig() throws IOException {
+    public FreeMarkerConfigurer freemarkerClassLoaderConfig() {
         Configuration configuration = new Configuration(Configuration.VERSION_2_3_31);
-        TemplateLoader templateLoader = new FileTemplateLoader(new File(env.getProperty("jeecg.path.emailTemplateDir"))) {
-        };
-        configuration.setTemplateLoader(templateLoader);
+        configuration.setTemplateLoader(new ClassTemplateLoader(getClass(), "/templates"));
         FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer();
         freeMarkerConfigurer.setConfiguration(configuration);
         return freeMarkerConfigurer;

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version} </name>