保存收款记录2

src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -3,6 +3,7 @@ package com.caimei365.order.controller;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.ReceiptAuthDto;
 import com.caimei365.order.model.dto.ReceiptDto;
+import com.caimei365.order.model.po.ReceiptPo;
 import com.caimei365.order.model.vo.ReceiptVo;
 import com.caimei365.order.model.vo.ReceiptUserVo;
 import com.caimei365.order.service.ReceiptService;
@@ -81,7 +82,7 @@ public class ReceiptApi {
 
     @ApiOperation("保存收款信息")
     @PostMapping("/save")
-    public ResponseJson<ReceiptVo> saveReceipt(ReceiptDto receiptDto) {
+    public ResponseJson<ReceiptPo> saveReceipt(ReceiptDto receiptDto) {
         return receiptService.saveReceipt(receiptDto);
     }
 

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

@@ -101,4 +101,12 @@ public class ReceiptPo implements Serializable {
      * 更新操作时间
      */
     private String updateDate;
+    /**
+     * 自动审核收款标记（0手动分享去确认审核，1收款直接确认并审核[适用星范带有正确订单标识的收款]）
+     */
+    private String autoAuditFlag;
+    /**
+     * 当前识别短信是否已经识别存在系统。0新短信可以识别，1已经存在识别短信。
+     */
+    private String smsContentPresenceFlag;
 }

src/main/java/com/caimei365/order/service/ReceiptService.java

@@ -2,8 +2,9 @@ package com.caimei365.order.service;
 
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.ReceiptDto;
-import com.caimei365.order.model.vo.ReceiptVo;
+import com.caimei365.order.model.po.ReceiptPo;
 import com.caimei365.order.model.vo.ReceiptUserVo;
+import com.caimei365.order.model.vo.ReceiptVo;
 import org.springframework.http.HttpHeaders;
 
 /**
@@ -35,5 +36,5 @@ public interface ReceiptService {
     /**
      * 保存收款信息
      */
-    ResponseJson<ReceiptVo> saveReceipt(ReceiptDto receiptDto);
+    ResponseJson<ReceiptPo> saveReceipt(ReceiptDto receiptDto);
 }

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

@@ -146,7 +146,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseJson<ReceiptVo> saveReceipt(ReceiptDto receiptDto) {
+    public ResponseJson<ReceiptPo> saveReceipt(ReceiptDto receiptDto) {
         // 收款用户
         ReceiptUserVo receiptUser = checkPermissions(1, receiptDto.getOpenid());
         if (null == receiptUser) {
@@ -157,14 +157,11 @@ public class ReceiptServiceImpl implements ReceiptService {
         ReceiptPo receiptPo = new ReceiptPo();
         BeanUtils.copyProperties(receiptDto, receiptPo);
         receiptPo.setUpdateDate(time);
+        // 默认不自动确认审核
+        receiptPo.setAutoAuditFlag("0");
         if (StringUtils.isNotBlank(receiptDto.getSmsContent())) {
             receiptPo.setSmsMd5Code(Md5Util.md5(receiptDto.getSmsContent()));
         }
-        ReceiptVo responseVo = new ReceiptVo();
-        // receiptPo -- copy to --> receiptVo
-        BeanUtils.copyProperties(receiptPo, responseVo);
-        // 默认不自动确认审核
-        responseVo.setAutoAuditFlag("0");
         // 收款作废
         if (null != receiptDto.getId() && StringUtils.isNotBlank(receiptDto.getDelFlag())){
             // 收款状态receiptStatus:2已确认(待审核)、3审核通过
@@ -195,10 +192,10 @@ public class ReceiptServiceImpl implements ReceiptService {
                 ReceiptVo receiptVo = getReceiptByMd5Msg(md5Msg);
                 if (receiptVo != null) {
                     // 短信已存在不需要识别
-                    responseVo.setSmsContentPresenceFlag("1");
-                    return ResponseJson.success(responseVo);
+                    receiptPo.setSmsContentPresenceFlag("1");
+                    return ResponseJson.success(receiptPo);
                 } else {
-                    responseVo.setSmsContentPresenceFlag("0");
+                    receiptPo.setSmsContentPresenceFlag("0");
                 }
             }
             if (StringUtils.isNotBlank(receiptDto.getSmsContent())) {
@@ -206,7 +203,6 @@ public class ReceiptServiceImpl implements ReceiptService {
                 // 隐藏余额
                 message = hiddenBalance(message);
                 receiptPo.setSmsContent(message);
-                responseVo.setSmsContent(message);
             }
             // 收款款项类型receiptType：2非订单款
             if ("2".equals(receiptDto.getReceiptType())) {
@@ -239,7 +235,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             // 设置手动回滚事务
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                             log.info("订单（Id：" + orderFlag + "）已全部收款，无需再收款！");
-                            return ResponseJson.error("订单（Id：" + orderFlag + "）已全部收款，无需再收款！", responseVo);
+                            return ResponseJson.error("订单（Id：" + orderFlag + "）已全部收款，无需再收款！", receiptPo);
                         }
                         // 收款项和订单关系表
                         OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
@@ -313,8 +309,8 @@ 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) {
                             // 防止使用短信操作已支付或者为确认的订单。
-                            responseVo.setAutoAuditFlag("0");
-                            return ResponseJson.success(responseVo);
+                            receiptPo.setAutoAuditFlag("0");
+                            return ResponseJson.success(receiptPo);
                         }
                         statusFlag = statusFlag + status.toString().charAt(1);
                         order.setPayableAmount(payAbleAmount);
@@ -393,18 +389,18 @@ public class ReceiptServiceImpl implements ReceiptService {
                         receiptMapper.updateReceipt(receiptPo);
 
                         /* 保存订单关系之后自动审核*/
-                        responseVo.setAutoAuditFlag("1");
+                        receiptPo.setAutoAuditFlag("1");
 
                     } else {//针对订单号异常或订单不存在的则继续分享人工确认
-                        responseVo.setAutoAuditFlag("0");
+                        receiptPo.setAutoAuditFlag("0");
                     }
                 } else {
                     // 针对没有订单号的也是走老流程
-                    responseVo.setAutoAuditFlag("0");
+                    receiptPo.setAutoAuditFlag("0");
                 }
             }
         }
-        return ResponseJson.success(responseVo);
+        return ResponseJson.success(receiptPo);
     }
 
     /**