注释，异常提示优化

framework/src/main/java/cn/lili/modules/order/customs/CustomPayload.java

@@ -19,9 +19,9 @@ public enum CustomPayload {
     public String dxpId;
     /** 默认为DXP,指中国电子口岸数据交换平台 */
     public String dxpMode;
-    /** 报文传输的企业名称 */
-    public String copCode;
     /** 报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致） */
+    public String copCode;
+    /** 报文传输的企业名称 */
     public String copName;
     /** 签名key */
     public String signKey;

framework/src/main/java/cn/lili/modules/order/customs/JiangyinServiceManager.java

@@ -44,7 +44,7 @@ public class JiangyinServiceManager {
         this.orderCustomsMapper = orderCustomsMapper;
     }
 
-    public void push(OrderDetailVO detailVO){
+    public boolean push(OrderDetailVO detailVO){
         Assert.isTrue(!detailVO.getOrder().getCustomsFlag(), () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单已推送海关，请勿重复推送"));
         Assert.isTrue(PayStatusEnum.PAID.name().equals(detailVO.getOrder().getPayStatus()),
                 () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单尚未支付，无法推送海关"));
@@ -54,8 +54,9 @@ public class JiangyinServiceManager {
         log.info("method input param: {}, payload: {}", JSONUtil.toJsonStr(detailVO), payload.toString());
         // 报文内容(密文)
         CustomsExchange exchange = new CustomsExchange(UUID.randomUUID().toString(), detailVO);
-        customsRec.setReqMsg(converter.toReq(exchange, payload));
-        String encryptContent = AESEncrypt.encrypt(customsRec.getReqMsg(), payload.signKey);
+        final String reqMsg = converter.toReq(exchange, payload);
+        customsRec.setReqMsg(reqMsg);
+        String encryptContent = AESEncrypt.encrypt(reqMsg, payload.signKey);
         // 构建参数
         JiangyinServiceParam param = JiangyinServiceParam.builder()
                 .signMsg(converter.getSign(encryptContent, payload.signKey))
@@ -70,7 +71,8 @@ public class JiangyinServiceManager {
         String res = HttpUtil.post(JIANGYIN_ORDER_PUSH_URL, paramMap, 30000);
         log.info("response msg: {}", res);
         customsRec.setResMsg(res);
-        if (converter.checkSuccess(res)){
+        boolean success = converter.checkSuccess(res);
+        if (success){
             // 推送成功更新订单状态为已推送
             Order order = exchange.getOrderDetailVO().getOrder();
             order.setCustomsFlag(true);
@@ -78,6 +80,7 @@ public class JiangyinServiceManager {
             orderMapper.updateById(order);
         }
         orderCustomsMapper.insert(customsRec);
+        return success;
     }
 }
 

framework/src/main/java/cn/lili/modules/order/customs/converter/JiangyinServiceReqConverter.java

@@ -59,7 +59,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
         } catch (Exception e) {
             e.printStackTrace();
         }
-        throw new RuntimeException("gen sign failed.");
+        throw new ServiceException(ORDER_CUSTOMS_ERROR, "签名生成失败");
     }
 
     @Override

framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java

@@ -178,7 +178,7 @@ public interface OrderService extends IService<Order> {
      *
      * @param orderSn 订单编号
      */
-    void customsPush(String orderSn);
+    boolean customsPush(String orderSn);
 
     /**
      * 订单核验

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -460,11 +460,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     @OrderLogPoint(description = "'订单['+#orderSn+']申请报关'", orderSn = "#orderSn")
     @Transactional(rollbackFor = Exception.class)
-    public void customsPush(String orderSn) {
+    public boolean customsPush(String orderSn) {
         //获取订单信息
         OrderDetailVO detailVO = this.queryDetail(orderSn);
         // 海关平台推送
-        jiangyinServiceManager.push(detailVO);
+        return jiangyinServiceManager.push(detailVO);
     }
 
     @Override

seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -178,7 +178,6 @@ public class OrderStoreController {
     @ApiOperation(value = "申请报关")
     @PostMapping(path = "/customs/push/{orderSn}")
     public ResultMessage<Object> customsPush(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) {
-        orderService.customsPush(orderSn);
-        return ResultUtil.data("推送成功");
+        return ResultUtil.data(orderService.customsPush(orderSn)? "推送成功" : "推送失败");
     }
 }