Aidea product update by Strive Date 2020-10-23

aidea-modules/waybill-module-web/src/main/webapp/WEB-INF/views/waybill/waybilllist.html

@@ -96,6 +96,7 @@
                                     <th>顺丰运单号</th>
                                     <th>会员名称</th>
                                     <th>联系人</th>
+                                    <th>创建时间</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -215,7 +216,6 @@
                     'visible': false,
                     'targets': [0]
                 },
-
                 {
                     "aTargets": [5],
                     "mData": "createTime",

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/dao/WaybillMapper.xml

@@ -75,12 +75,12 @@
         monthly_card,
         express_type_id,
         temperature_range,
-        AES_DECRYPT(contact, 'aideakey') contact,
-        AES_DECRYPT(mobile, 'aideakey') mobile,
-        AES_DECRYPT(province, 'aideakey') province,
-        AES_DECRYPT(city, 'aideakey') city,
-        AES_DECRYPT(county, 'aideakey') county,
-        AES_DECRYPT(address, 'aideakey') address,
+        CONVERT( AES_DECRYPT(t.contact, 'aideakey') USING UTF8) contact,
+        CONVERT( AES_DECRYPT(t.mobile, 'aideakey') USING UTF8) mobile,
+        CONVERT( AES_DECRYPT(t.province, 'aideakey') USING UTF8) province,
+        CONVERT( AES_DECRYPT(t.city, 'aideakey') USING UTF8) city,
+        CONVERT( AES_DECRYPT(t.county, 'aideakey') USING UTF8) county,
+        CONVERT( AES_DECRYPT(t.address, 'aideakey') USING UTF8) address,
         address_id,
         send_express_date,
         accept_express_date,
@@ -149,12 +149,12 @@
         #{monthlyCard, jdbcType=VARCHAR},
         #{expressTypeId, jdbcType=VARCHAR},
         #{temperatureRange, jdbcType=VARCHAR},
-        AES_ENCRYPT(#{contact, jdbcType=BINARY}, 'aideakey'),
-        AES_ENCRYPT(#{mobile, jdbcType=BINARY}, 'aideakey'),
-        AES_ENCRYPT(#{province, jdbcType=BINARY}, 'aideakey'),
-        AES_ENCRYPT(#{city, jdbcType=BINARY}, 'aideakey'),
-        AES_ENCRYPT(#{county, jdbcType=BINARY}, 'aideakey'),
-        AES_ENCRYPT(#{address, jdbcType=BINARY}, 'aideakey'),
+        AES_ENCRYPT(#{contact, jdbcType=VARBINARY}, 'aideakey'),
+        AES_ENCRYPT(#{mobile, jdbcType=VARBINARY}, 'aideakey'),
+        AES_ENCRYPT(#{province, jdbcType=VARBINARY}, 'aideakey'),
+        AES_ENCRYPT(#{city, jdbcType=VARBINARY}, 'aideakey'),
+        AES_ENCRYPT(#{county, jdbcType=VARBINARY}, 'aideakey'),
+        AES_ENCRYPT(#{address, jdbcType=VARBINARY}, 'aideakey'),
         #{addressId, jdbcType=VARCHAR},
         now(),
         now(),
@@ -178,9 +178,8 @@
     </select>
 
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM t_aidea_waybill
+        SELECT COUNT(1) FROM t_aidea_waybill t
         <include refid="sqlWhere"/>
-
     </select>
 
     <select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.waybill.model.Waybill">
@@ -197,12 +196,12 @@
             t.monthly_card monthlyCard,
             t.express_type_id expressTypeId,
             t.temperature_range temperatureRange,
-            AES_DECRYPT(t.contact, 'aideakey') contact,
-            AES_DECRYPT(t.mobile, 'aideakey') mobile,
-            AES_DECRYPT(t.province, 'aideakey') province,
-            AES_DECRYPT(t.city, 'aideakey') city,
-            AES_DECRYPT(t.county, 'aideakey') county,
-            AES_DECRYPT(t.address, 'aideakey') address,
+            CONVERT( AES_DECRYPT(t.contact, 'aideakey') USING UTF8) contact,
+            CONVERT( AES_DECRYPT(t.mobile, 'aideakey') USING UTF8) mobile,
+            CONVERT( AES_DECRYPT(t.province, 'aideakey') USING UTF8) province,
+            CONVERT( AES_DECRYPT(t.city, 'aideakey') USING UTF8) city,
+            CONVERT( AES_DECRYPT(t.county, 'aideakey') USING UTF8) county,
+            CONVERT( AES_DECRYPT(t.address, 'aideakey') USING UTF8) address,
             t.address_id addressId,
             t.send_express_date sendExpressDate,
             t.accept_express_date acceptExpressDate,
@@ -223,7 +222,7 @@
             AES_DECRYPT(m.name, 'aideakey') memberName
         FROM t_aidea_waybill t
         LEFT JOIN t_order o ON t.order_id = o.id
-        LEFT JOIN t_order_details od ON o.id = order_id
+        LEFT JOIN t_order_details od ON o.id = od.order_id
         LEFT JOIN wx_mp_member m ON t.member_id = m.id
         <include refid="sqlWhere"/>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
@@ -270,22 +269,22 @@
                 temperature_range = #{temperatureRange, jdbcType=VARCHAR},
             </if>
             <if test="contact != null">
-                contact = AES_ENCRYPT(#{contact, jdbcType=BINARY}, 'aideakey'),
+                contact = AES_ENCRYPT(#{contact, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="mobile != null">
-                mobile = AES_ENCRYPT(#{mobile, jdbcType=BINARY}, 'aideakey'),
+                mobile = AES_ENCRYPT(#{mobile, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="province != null">
-                province = AES_ENCRYPT(#{province, jdbcType=BINARY}, 'aideakey'),
+                province = AES_ENCRYPT(#{province, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="city != null">
-                city = AES_ENCRYPT(#{city, jdbcType=BINARY}, 'aideakey'),
+                city = AES_ENCRYPT(#{city, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="county != null">
-                county = AES_ENCRYPT(#{county, jdbcType=BINARY}, 'aideakey'),
+                county = AES_ENCRYPT(#{county, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="address != null">
-                address = AES_ENCRYPT(#{address, jdbcType=BINARY}, 'aideakey'),
+                address = AES_ENCRYPT(#{address, jdbcType=VARBINARY}, 'aideakey'),
             </if>
             <if test="addressId != null">
                 address_id = #{addressId, jdbcType=VARCHAR},

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/web/WaybillController.java

@@ -103,9 +103,9 @@ public class WaybillController {
     public JSONObject listData(int iDisplayStart, int iDisplayLength, Waybill waybill, HttpServletRequest request) {
         Long accountsId = UserUtils.getmpaccounts(request);
         Conds conds = new Conds();
-        conds.equal("del_flag", Constants.DEL_FLAG_0);
-        conds.equal("accounts_id", accountsId);
-        Sort sort = new Sort("create_time", OrderType.DESC);
+        conds.equal("t.del_flag", Constants.DEL_FLAG_0);
+        conds.equal("t.accounts_id", accountsId);
+        Sort sort = new Sort("t.create_time", OrderType.DESC);
 
         List<Waybill> list = waybillService.fetchSearchByPage(conds, sort, iDisplayStart, iDisplayLength);
         Integer counts = waybillService.count(conds);