Merge remote-tracking branch 'origin/master'

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/card/InvwCardDetailsController.java

@@ -36,7 +36,7 @@ public class InvwCardDetailsController extends MyValidController {
 
     @ApiOperation(value = "01-卡设备分页查询")
     @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody InvwCardDetailsPageRequestDTO dto) throws ServiceHandleException {
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwCardDetailsPageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.page(dto));
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/enter/InvwEnterApplyController.java

@@ -34,7 +34,7 @@ class InvwEnterApplyController extends MyValidController {
 
     @ApiOperation(value = "入库申请分页查询")
     @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody InvwEnterApplyPageRequestDTO req) throws ServiceHandleException {
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwEnterApplyPageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.page(req));
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/obu/InvwObuDetailsController.java

@@ -36,7 +36,7 @@ public class InvwObuDetailsController extends MyValidController {
 
     @ApiOperation(value = "01-签设备分页查询")
     @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody InvwObuDetailsPageRequestDTO dto) throws ServiceHandleException {
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwObuDetailsPageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.page(dto));
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/CommDeviceCancelManager.java

@@ -156,30 +156,31 @@ public class CommDeviceCancelManager extends AbstractCommManager {
     public void wxgzhNotice(AssOrderinfo orderInfo) throws ServiceHandleException {
         String orderNo = orderInfo.getOrderNo();
         logger.info("订单号：{}，微信公众号通知开始", orderNo);
-        AccountInfo accountInfo = queryAccountInfoByOpenId(orderInfo.getOpenId());
-        if (hasText(accountInfo.getMpOpenid())) {
-            MsgwWxMpSendRequest mpSendRequest = new MsgwWxMpSendRequest();
-            mpSendRequest.setData("{" +
-                    "\"first\":{\"value\":\"订单状态变更\"}," +
-                    "\"keyword1\":{\"value\":\"" + orderNo + "\"}," +
-                    "\"keyword2\":{\"value\":\"" + orderInfo.getOrderType().getDesc() + "\"}," +
-                    "\"keyword3\":{\"value\":\"" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "\"}," +
-                    "\"remark\":{\"value\":\"设备注销成功\"}" +
-                    "}");
-            mpSendRequest.setClientId("bfc4040bda90473d8ceab246555361a3");
-            mpSendRequest.setTitle("订单状态变更");
-            mpSendRequest.setMpOpenId(accountInfo.getMpOpenid());
-            mpSendRequest.setTemplateName("Wn_--Fg98Okqydw8YWLVSp2gxESXZ5DhJF60hKae-FM");
-            mpSendRequest.setSendOrderType(orderInfo.getOrderType());
-            mpSendRequest.setOrderType(OrderType.AFTERSALE);
-            mpSendRequest.setOrderNo(orderNo);
-            logger.info("订单号：{}，通知内容{}", orderNo, mpSendRequest.toString());
-            try {
+        try {
+            AccountInfo accountInfo = queryAccountInfoByOpenId(orderInfo.getOpenId());
+            if (hasText(accountInfo.getMpOpenid())) {
+                MsgwWxMpSendRequest mpSendRequest = new MsgwWxMpSendRequest();
+                mpSendRequest.setData("{" +
+                        "\"first\":{\"value\":\"订单状态变更\"}," +
+                        "\"keyword1\":{\"value\":\"" + orderNo + "\"}," +
+                        "\"keyword2\":{\"value\":\"" + orderInfo.getOrderType().getDesc() + "\"}," +
+                        "\"keyword3\":{\"value\":\"" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "\"}," +
+                        "\"remark\":{\"value\":\"设备注销成功\"}" +
+                        "}");
+                mpSendRequest.setClientId("bfc4040bda90473d8ceab246555361a3");
+                mpSendRequest.setTitle("订单状态变更");
+                mpSendRequest.setMpOpenId(accountInfo.getMpOpenid());
+                mpSendRequest.setTemplateId("Wn_--Fg98Okqydw8YWLVSp2gxESXZ5DhJF60hKae-FM");
+                mpSendRequest.setSendOrderType(orderInfo.getOrderType());
+                mpSendRequest.setOrderType(OrderType.AFTERSALE);
+                mpSendRequest.setOrderNo(orderNo);
+                logger.info("订单号：{}，通知内容{}", orderNo, mpSendRequest.toString());
+
                 jsonPostRepeat(mpSendRequest);
                 logger.info("订单号：{}，微信公众号通知成功", orderNo);
-            } catch (Exception e) {
-                logger.error("订单号：{}，微信公众号通知失败", orderNo, e);
             }
+        } catch (Exception e) {
+            logger.error("订单号：{}，微信公众号通知失败", orderNo, e);
         }
     }
 
@@ -207,7 +208,7 @@ public class CommDeviceCancelManager extends AbstractCommManager {
                 mpSendRequest.setClientId("bfc4040bda90473d8ceab246555361a3");
                 mpSendRequest.setTitle("查询结果通知");
                 mpSendRequest.setMpOpenId(accountInfo.getMpOpenid());
-                mpSendRequest.setTemplateName("o7SwaOO_01I9MVJ7YFH5_NhvVZFEcsEU2LBDJbFS_RY");
+                mpSendRequest.setTemplateId("o7SwaOO_01I9MVJ7YFH5_NhvVZFEcsEU2LBDJbFS_RY");
 
                 logger.info("customerId：{}，通知内容{}", customer.getCustomerId(), mpSendRequest.toString());
                 jsonPostRepeat(mpSendRequest);