Aidea product update by Strive Date 2020-11-28

aidea-modules/authentication-module-web/src/main/webapp/WEB-INF/views/authentication/authenticationform.html

@@ -203,7 +203,7 @@
                             var sum = 0;
                             if (!isIdCard2.test(card)) {
                                 Cfapp.alert({
-                                    message: "请输入正确格式的省份证号码",
+                                    message: "请输入正确格式的身份证号码",
                                     btntext: "确定",
                                     success: function () {
                                     }
@@ -216,7 +216,7 @@
                             var birthday = card.substr(6, 8);
                             if (birthday != dateToString(new Date(year + '/' + month + '/' + day))) { //校验日期是否合法
                                 Cfapp.alert({
-                                    message: "请输入正确格式的省份证号码",
+                                    message: "请输入正确格式的身份证号码",
                                     btntext: "确定",
                                     success: function () {
                                     }
@@ -265,7 +265,7 @@
                                 });
                             } else {
                                 Cfapp.alert({
-                                    message: "请输入正确格式的省份证号码",
+                                    message: "请输入正确格式的身份证号码",
                                     btntext: "确定",
                                     success: function () {
                                     }

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

@@ -112,6 +112,7 @@
                                     <th>顺丰运单号</th>
                                     <th>订单编码</th>
                                     <th>咨询单编码</th>
+                                    <th>是否打印</th>
                                     <th>粉丝昵称</th>
                                     <th>OpenId</th>
                                     <th>联系人名称</th>
@@ -165,6 +166,9 @@
 <!-- AdminLTE for demo purposes -->
 <script src="common/js/cfapp.js"></script>
 <script>
+    var csrf = '${_csrf.token}';
+    var csrf_header = '${_csrf.headerName}';
+
     function formatDates(now) {
         var now = new Date(now);
         var year = now.getFullYear();
@@ -229,6 +233,16 @@
                 {
                     "mData": "consultSheetCode"
                 },
+                {
+                    "mData": "status",
+                    "mRender": function (a, b, c, d) {
+                        if (a == '0') {
+                            return "未打印";
+                        } else {
+                            return "已打印";
+                        }
+                    }
+                },
                 {
                     "mData": "nickName"
                 },
@@ -307,7 +321,7 @@
                     'targets': [0]
                 },
                 {
-                    "aTargets": [14],
+                    "aTargets": [15],
                     "mData": "id",
                     "mRender": function (a, b, c, d) {
                         var html = '#if($shiro.hasPermission("qy:waybill:edit"))';
@@ -319,7 +333,7 @@
                             '</button>\n' +
                             '<ul class="dropdown-menu" role="menu" style="min-width: 100px;">\n';
                         html += '<li><a href="#springUrl("/a/waybill/form?id=' + a + '")">查看</a></li>';
-                        html += '<li><a href="#springUrl("/a/waybill/orderPrinterBill?orderId=' + c.orderId + '")">打印物流单</a></li>';
+                        html += '<li><a onclick="printerSfSdk(' + c.orderId + ')">打印物流单</a></li>';
                         html += '</ul>';
                         html += '#end';
                         return html;
@@ -396,6 +410,49 @@
     }
 
 
+    function printerSfSdk(orderId) {
+        let urls = "#springUrl('/a/waybill/orderPrinterBill')";
+        Cfapp.confirm({
+            message: "是否打印物流单据?",
+            btnoktext: "确定",
+            btncanceltext: "取消",
+            success: function () {
+                $.ajax({
+                    type: "POST",
+                    url: urls,
+                    data: {
+                        orderId: orderId,
+                        _csrf: csrf, _csrf_header: csrf_header,
+                    },
+                    success: function (data) {
+                        if (data.errorNo == 0) {
+                            Cfapp.alert({
+                                message: "打印成功",
+                                btntext: "确定",
+                                success: function () {
+                                    location.href = "#springUrl('/a/waybill/list')";
+                                }
+                            });
+                        } else {
+                            Cfapp.alert({
+                                message: "打印失败",
+                                btntext: "确定",
+                                success: function () {
+                                    location.href = "#springUrl('/a/waybill/list')";
+                                }
+                            });
+                        }
+                    },
+                    error: function () {
+                    }
+                })
+            },
+            cancel: function () {
+                $(".modal-backdrop").fadeOut();
+            }
+        });
+    }
+
 </script>
 
 </body>

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

@@ -406,7 +406,7 @@
                 mobile = #{mobile, jdbcType=VARCHAR},
             </if>
             <if test="province != null">
-                province = {province, jdbcType=VARCHAR},
+                province = #{province, jdbcType=VARCHAR},
             </if>
             <if test="city != null">
                 city = #{city, jdbcType=VARCHAR},
@@ -463,7 +463,7 @@
                 dest_code = #{destCode, jdbcType=VARCHAR},
             </if>
         </set>
-        where id=#{id,jdbcType=BIGINT}
+        where id=#{id, jdbcType=BIGINT}
     </update>
 
     <update id="delete" parameterType="java.lang.Long">

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/service/impl/WaybillServiceImpl.java

@@ -179,7 +179,7 @@ public class WaybillServiceImpl extends GenericServiceImpl<Waybill> implements W
                         waybill.setWaybillRemark(msgData.getString("remark"));//不可派发原因
 
                         waybillMapper.save(waybill);
-                        orderService.save(order);
+                        orderService.update(order);
 
                         retObj.put("errorNo", 0);
                         retObj.put("errorMsg", "下单接口调用成功");
@@ -251,14 +251,23 @@ public class WaybillServiceImpl extends GenericServiceImpl<Waybill> implements W
             JSONObject result = ExpressOrderInfoUtils.generateBillPrinterObj(order, odets, waybill);
             JSONArray arr = new JSONArray();
             arr.add(result);
-            BillPrinterUtils.executePrinter(arr.toString());
+            boolean bool = BillPrinterUtils.executePrinter(arr.toString());
+            if (bool) {
+                waybill.setStatus("1");
+                waybillMapper.update(waybill);
+                retObj.put("errorNo", 0);
+                retObj.put("errorMsg", "调用打印服务成功!");
+            } else {
+                retObj.put("errorNo", 1);
+                retObj.put("errorMsg", "调用打印服务失败!");
+            }
         } catch (Exception e) {
-            log.error("待用打印服务出错");
             e.getMessage();
-        } finally {
-
+            log.error("调用顺丰打印sdk服务失败 errorMsg = " + e.getMessage());
+            retObj.put("errorNo", 1);
+            retObj.put("errorMsg", "调用打印服务失败!" + e.getMessage());
         }
-        return null;
+        return retObj;
     }
 
 

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/utils/BillPrinterUtils.java

@@ -87,13 +87,14 @@ public class BillPrinterUtils {
                 Base64ImageTools.generateImage(strImg, fileName);
                 files.add(fileName);
             }
-
         } catch (MalformedURLException e) {
             e.printStackTrace();
+            log.error("调用顺丰打印sdk服务失败 errorMsg = " + e.getMessage());
+            return false;
         } catch (IOException e) {
             e.printStackTrace();
-        } finally {
-            log.info("调用丰密订单打印方法");
+            log.error("调用顺丰打印sdk服务失败 errorMsg = " + e.getMessage());
+            return false;
         }
         return true;
     }

membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addresslist.html

@@ -292,7 +292,7 @@
                     "aTargets": [4],
                     "mData": "phone",
                     "mRender": function (a, b, c, d) {
-                        return c.phone.slice(0, 1) + '*' + c.phone.slice(2, 3);
+                        return a.slice(0, 3) + '****' + a.slice(7);
                     }
                 },
                 {
@@ -348,15 +348,12 @@
         });
     }
 
-    // return '<a href="#springUrl("/a/address/form?id=' + c.id + '")" data-id="' + c.id + '" data-action="view">' + formatDates(a, "yyyy-MM-dd HH:mm:ss");
-    // +'</a>';
     jQuery(document).ready(function () {
         var url = "#springUrl('/a/address/listArea')"
         $.ajax({
             url: url,
             type: "GET",
             success: function (data) {
-                console.log(data)
                 areaList = data
                 listProvince = data.filter(x => x.cityType == 1)
                 var province = document.querySelector('#province') //querySelector获取id="province"的元素
@@ -365,8 +362,6 @@
                     //将循环出来的元素追加到province下拉框里
                     province.options[province.length] = op
                 }
-
-
             }
         });
 
@@ -454,22 +449,6 @@
         });
     }
 
-    // function importExcel() {
-    //     var templateExcelUrl = "#springUrl('/a/address/templateExcel')";
-    //     var importExcelUrl = "#springUrl('/a/address/importExcel')";
-    //     Cfapp.importExcel({
-    //         title: '收货地址管理导入',
-    //         importurl: importExcelUrl,
-    //         templateurl: templateExcelUrl,
-    //         cancel: function () {
-    //
-    //         },
-    //         success: function () {
-    //
-    //         }
-    //     });
-    // }
-
 
 </script>
 

mp-modules/mp-message-module-web/src/main/webapp/WEB-INF/views/managerwechat/replyform.html

@@ -225,7 +225,7 @@
 
     var cfarticleOrderList = "#springUrl('/a/cfarticle/listDataInOrder')"; //获取
     if ("$!{reply.replyType}" == "text") {
-        $("#content_source").val('${reply.contentSource}'.replace(/<br\/>/g, "\r\n"));
+        $("#content_source").val("$!{reply.contentSource}".replace(/<br\/>/g, "\r\n"));
     }
     if ("$!{reply.id}" != null && "$!{reply.id}" != "") {
         $("#updateId").val("$reply.id");
@@ -288,7 +288,7 @@
             $("#contentText").hide();
 
         } else {
-            $("#content_source").val('$!{reply.contentSource}'.replace(/<br\/>/g, "\r\n"));
+            $("#content_source").val("$!{reply.contentSource}".replace(/<br\/>/g, "\r\n"));
         }
 
         //将radio值填充并选中

mp-modules/mp-message-module/src/main/java/com/cftech/mp/reply/web/ReplyController.java

@@ -13,12 +13,14 @@ import com.cftech.sys.security.UserUtils;
 
 import net.sf.json.JSONArray;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.owasp.esapi.ESAPI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.util.HtmlUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -71,6 +73,10 @@ public class ReplyController {
 	public String replyform(Reply reply,Model model){
 		if(reply.getId()!=null){
 			reply = replyService.fetchById(reply.getId());
+//			reply.setContentSource(reply.getContentSource().replace("<br/>", "\n"));
+//			String contents =  ESAPI.encoder().decodeForHTML(reply.getContentSource());
+//			String content = HtmlUtils.htmlUnescape(contents);
+//			reply.setContentSource(content);
 		}
 		model.addAttribute("reply", reply);
 		return "managerwechat/replyform";
@@ -80,7 +86,9 @@ public class ReplyController {
 	@ResponseBody
 	public JSONObject addreply(Reply reply,HttpServletRequest request){
 		if(StringUtils.equals(reply.getReplyType(),"text")){
-			reply.setContentSource(reply.getContentSource().replace("\n", "<br/>"));
+			String contents =  ESAPI.encoder().decodeForHTML(reply.getContentSource());
+			String content = HtmlUtils.htmlUnescape(contents);
+			reply.setContentSource(content.replace("\n", "<br/>"));
 		}
 		Conds conds = new Conds();
 		 Long id=UserUtils.getmpaccounts(request);