重复识别

src/main/java/com/caimei365/order/model/po/ReceiptPo.java

@@ -29,11 +29,11 @@ public class ReceiptPo implements Serializable {
     /**
      * 用户付款方式：1线上，2线下，3余额抵扣
      */
-    private String payWay;
+    private Integer payWay;
     /**
      * 付款类型：1建设银行7297、2广发银行0115、3中信银行7172、4中信银行0897、5中信银行0897-财付通、6中信银行0897-支付宝、7线上-支付宝、8线上-微信支付、9线上-快钱支付、10口头返佣、11广发银行5461、12PC-B2B网银、13PC-微信支付、14PC-支付宝、15小程序-微信支付、16余额抵扣、17PC-B2C网银
      */
-    private String payType;
+    private Integer payType;
     /**
      * 收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
      */
@@ -41,7 +41,7 @@ public class ReceiptPo implements Serializable {
     /**
      * 收款状态：1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
      */
-    private String receiptStatus;
+    private Integer receiptStatus;
     /**
      * 收款时间
      */
@@ -57,7 +57,7 @@ public class ReceiptPo implements Serializable {
     /**
      * 订单标识
      */
-    private String orderFlag;
+    private Integer orderFlag;
     /**
      * 作废标记
      */
@@ -85,7 +85,7 @@ public class ReceiptPo implements Serializable {
     /**
      * 撤销人权限Id(对应cm_receipt_user表)
      */
-    private String cancelUserPermissionId;
+    private Integer cancelUserPermissionId;
     /**
      * 审核时间
      */
@@ -105,11 +105,11 @@ public class ReceiptPo implements Serializable {
     /**
      * 自动审核收款标记（0手动分享去确认审核，1收款直接确认并审核[适用星范带有正确订单标识的收款]）
      */
-    private String autoAuditFlag;
+    private Integer autoAuditFlag;
     /**
      * 当前识别短信是否已经识别存在系统。0新短信可以识别，1已经存在识别短信。
      */
-    private String smsContentPresenceFlag;
+    private Integer smsContentPresenceFlag;
     /**
      * 非订单款说明(适用协销确认的时候区分订单和非订单款)
      */

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -151,6 +151,12 @@ public class ReceiptServiceImpl implements ReceiptService {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作！", null);
         }
+        String md5Msg = Md5Util.md5(smsContent);
+        ReceiptVo receiptVo = getReceiptByMd5Msg(md5Msg);
+        if (receiptVo != null) {
+            // 短信已存在不需要识别
+            return ResponseJson.error("短信已存在不需要重复识别", null);
+        }
         try {
             // 识别短信内容
             ResponseJson<ReceiptVo> receipt = identifyMessage(smsContent);
@@ -180,7 +186,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         BeanUtils.copyProperties(receiptDto, receiptPo);
         receiptPo.setUpdateDate(time);
         // 默认不自动确认审核
-        receiptPo.setAutoAuditFlag("0");
+        receiptPo.setAutoAuditFlag(0);
         if (StringUtils.isNotBlank(receiptDto.getSmsContent())) {
             receiptPo.setSmsMd5Code(Md5Util.md5(receiptDto.getSmsContent()));
         }
@@ -194,10 +200,10 @@ public class ReceiptServiceImpl implements ReceiptService {
                 ReceiptVo receiptVo = getReceiptByMd5Msg(md5Msg);
                 if (receiptVo != null) {
                     // 短信已存在不需要识别
-                    receiptPo.setSmsContentPresenceFlag("1");
+                    receiptPo.setSmsContentPresenceFlag(1);
                     return ResponseJson.success(receiptPo);
                 } else {
-                    receiptPo.setSmsContentPresenceFlag("0");
+                    receiptPo.setSmsContentPresenceFlag(0);
                 }
             }
             if (StringUtils.isNotBlank(receiptDto.getSmsContent())) {
@@ -208,13 +214,13 @@ public class ReceiptServiceImpl implements ReceiptService {
             }
             // 收款款项类型receiptType：2非订单款
             if (null != receiptDto.getReceiptType() && 2 == receiptDto.getReceiptType()) {
-                receiptPo.setReceiptStatus("2");
+                receiptPo.setReceiptStatus(2);
             } else {
-                receiptPo.setReceiptStatus("1");
+                receiptPo.setReceiptStatus(1);
             }
             receiptPo.setDelFlag(0);
             receiptPo.setConfirmType(0);
-            receiptPo.setPayWay("2");
+            receiptPo.setPayWay(2);
             if (null == receiptDto.getHandlingFee()) {
                 receiptPo.setHandlingFee(0d);
             }
@@ -275,7 +281,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         receiptPo.setUpdateDate(time);
                         receiptPo.setConfirmDate(time);
                         receiptPo.setReviewDate(receiptDto.getReceiptDate());
-                        receiptPo.setPayWay("2");
+                        receiptPo.setPayWay(2);
                         // 更新收款记录
                         receiptMapper.updateReceipt(receiptPo);
 
@@ -310,7 +316,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         log.info(">>>>>>status：" + status);
                         if (status == 0 || status == 4 || status == 5 || status == 6 || status == 7 || status == 33 || status == 32 || status == 31) {
                             // 防止使用短信操作已支付或者为确认的订单。
-                            receiptPo.setAutoAuditFlag("0");
+                            receiptPo.setAutoAuditFlag(0);
                             return ResponseJson.success(receiptPo);
                         }
                         statusFlag = statusFlag + status.toString().charAt(1);
@@ -385,19 +391,19 @@ public class ReceiptServiceImpl implements ReceiptService {
                             baseMapper.insertBalanceRecord(balanceRecord);
                         }
 
-                        receiptPo.setReceiptStatus("3");
+                        receiptPo.setReceiptStatus(3);
                         receiptPo.setReviewUserPermissionId(receiptUser.getId());
                         receiptMapper.updateReceipt(receiptPo);
 
                         /* 保存订单关系之后自动审核*/
-                        receiptPo.setAutoAuditFlag("1");
+                        receiptPo.setAutoAuditFlag(1);
 
                     } else {//针对订单号异常或订单不存在的则继续分享人工确认
-                        receiptPo.setAutoAuditFlag("0");
+                        receiptPo.setAutoAuditFlag(0);
                     }
                 } else {
                     // 针对没有订单号的也是走老流程
-                    receiptPo.setAutoAuditFlag("0");
+                    receiptPo.setAutoAuditFlag(0);
                 }
             }
         }
@@ -448,7 +454,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         // 收款款项类型receiptType：2非订单款
         if (null != receiptDto.getReceiptType() && 2 == receiptDto.getReceiptType()) {
             receiptPo.setNoOrderReason(receiptDto.getNoOrderReason());
-            receiptPo.setReceiptStatus("2");
+            receiptPo.setReceiptStatus(2);
             receiptPo.setConfirmUserPermissionId(receiptUser.getId());
             receiptPo.setConfirmDate(time);
         }
@@ -769,7 +775,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         ReceiptPo receiptPo = new ReceiptPo();
         BeanUtils.copyProperties(receipt, receiptPo);
         receiptPo.setUpdateDate(time);
-        receiptPo.setReceiptStatus("2");
+        receiptPo.setReceiptStatus(2);
         receiptPo.setConfirmType(receiptAssociateDto.getConfirmType());
         // 非订单款项确认
         if (2 == receipt.getReceiptType()) {
@@ -926,7 +932,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 return ResponseJson.error("关联订单为空！", null);
             }
         }
-        receiptPo.setPayWay("2");
+        receiptPo.setPayWay(2);
         receiptPo.setConfirmUserPermissionId(receiptUser.getId());
         receiptPo.setConfirmDate(time);
         receiptMapper.updateReceipt(receiptPo);