Aidea product update by Strive Date 2020-11-03

aidea-modules/consult-module/pom.xml

@@ -32,10 +32,5 @@
             <artifactId>shipping-address-module</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.73</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -467,9 +467,6 @@
         LEFT JOIN area b ON s.city_id = b.areaid
         LEFT JOIN area c ON s.area_id = c.areaid
         WHERE t.del_flag=0 AND s.whether = 1
-        <if test="number">
-            AND t.number =#{number}
-        </if>
         <if test="id">
             AND t.id =#{id}
         </if>

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderFromVO.java

@@ -24,7 +24,7 @@ public class OrderFromVO {
     private Long payStatus;
     private String description;
     private String tradeNo;
-    @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     private Long confirm;
     private String orderCancel;
@@ -32,5 +32,4 @@ public class OrderFromVO {
     private Double amount;
 
 
-
 }

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderVO.java

@@ -13,27 +13,27 @@ import java.util.Date;
 @Data
 public class OrderVO {
     /* 产品编码 */
-    @ExportConfig(value = "商品编码",width = 100,showLevel = 1)
+    @ExportConfig(value = "商品编码", width = 100, showLevel = 1)
     private String productNumber;
     /* 产品名称 */
-    @ExportConfig(value = "商品名称",width = 100,showLevel = 1)
+    @ExportConfig(value = "商品名称", width = 100, showLevel = 1)
     private String productName;
     /* 订单金额 */
     @ExportConfig(value = "订单金额", width = 100, showLevel = 1)
     private Double orderAmount;
     /* 收货地址 */
-    @ExportConfig(value = "收货地址",width = 100,showLevel = 1)
+    @ExportConfig(value = "收货地址", width = 100, showLevel = 1)
     private String address;
-    @ExportConfig(value = "快递单号",width = 100,showLevel = 1)
+    @ExportConfig(value = "快递单号", width = 100, showLevel = 1)
     private String courierNumber;
     /* 交易号 支付宝/第三方平台 返回订单号 */
     @ExportConfig(value = "支付交易号", width = 100, showLevel = 1)
     private String tradeNo;
     /* 创建时间 */
-    @ExportConfig(value = "创建时间",width = 100,showLevel = 1)
+    @ExportConfig(value = "创建时间", width = 100, showLevel = 1)
     private String createTime;
     /* 订单状态 */
-    @ExportConfig(value = "订单状态",width = 100,showLevel = 1)
+    @ExportConfig(value = "订单状态", width = 100, showLevel = 1)
     private String payStatus;
 
 }

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -163,8 +163,10 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                     orderMobile.setProductMobile(mobiles);
                 }
             }
-            com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderMobiles));
-            object.put("orderMobiles",jsonObject);
+            //com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderMobiles));
+
+
+            object.put("orderMobiles", orderMobiles);
             rtnJson.put("errorNo","0");
             rtnJson.put("data",object);
         }catch (Exception e){

cftech-common-web/src/main/resources/common-test.properties

@@ -20,7 +20,7 @@ CONSULT_SHEET_AUDIT_FAILED_TEMPLATE_MSG=77tLdRPQx1m8Gg0-t9HCGVOlka0G4ocFPdq8D5Uk
 #\u56FE\u7247\u4E0A\u4F20\u5730\u5740
 #userfiles.imgdir=/Users/liuling/tools/apache-tomcat-8.0.15/data/img
 #userfiles.imgdir=/mydata/fileResource
-userfiles.imgdir=E:\\fileResource
+userfiles.imgdir=/mydata/fileResource
 
 #\u4F01\u4E1A\u53F7\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
 ROOT_ORG_NAME=\u6C5F\u82CF\u827E\u8FEA\u836F\u4E1A
@@ -36,7 +36,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
 #\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
 MEMBER_PASSWORD_KEY=DONGCHANGINT9527;
 list.refreshtoken=true
-jwt.domain=127.0.0.1
+jwt.domain=pd.shxrtech.com
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 jwt.duration=86400000
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue