注释规范化

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

@@ -122,13 +122,13 @@ public class ReceiptServiceImpl implements ReceiptService {
                         try {
                             String sessionKey = (String) infoData.get(WeChatService.Keys.SESSION_KEY);
                             String result = WeChatService.decrypt(encryptedData, sessionKey, iv, "UTF-8");
-                            log.info("解密数据>>>>>>" + result);
+                            log.info("【线下收款】解密数据>>>>>>" + result);
                             Map parseMap = JSONObject.parseObject(result, Map.class);
                             assert parseMap != null;
                             unionId = parseMap.get(WeChatService.Keys.UNION_ID).toString();
                             infoData.put(WeChatService.Keys.UNION_ID, unionId);
                         } catch (Exception e) {
-                            log.error("微信解密unionId失败:", e);
+                            log.error("【线下收款】微信解密unionId失败:", e);
                         }
                     }
                     receiptUser.setOpenid(openid);
@@ -180,7 +180,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 return receipt;
             }
         } catch (Exception e) {
-            log.error("短信识别错误!", e);
+            log.error("【线下收款】短信识别错误!", e);
         }
         return ResponseJson.error("短信识别错误！", null);
     }
@@ -247,7 +247,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             /* 如果订单是小程序组织订单来源则包含对应订单Id直接通过订单标识审核收款 */
             Integer orderFlag = receiptDto.getOrderFlag();
             // 参数订单标识
-            log.info("收款订单标识>>>>>>" + orderFlag);
+            log.info("【线下收款】收款订单标识>>>>>>" + orderFlag);
             // 订单款时才走自动关联
             if (null != receiptDto.getOrderFlag() && null != receiptDto.getReceiptType() && 1 == receiptDto.getReceiptType()) {
                 if (null != orderFlag && orderFlag > 0) {
@@ -257,7 +257,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         if (3 == order.getReceiptStatus()) {
                             // 设置手动回滚事务
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                            log.info("订单（Id：" + orderFlag + "）已全部收款，无需再收款！");
+                            log.info("【线下收款】订单（Id：" + orderFlag + "）已全部收款，无需再收款！");
                             return ResponseJson.error("订单（Id：" + orderFlag + "）已全部收款，无需再收款！", receiptPo);
                         }
                         // 收款项和订单关系表
@@ -271,21 +271,21 @@ public class ReceiptServiceImpl implements ReceiptService {
                         order.setPayableAmount(getUnPayMoney(order, true));
                         if (order.getPayableAmount().equals(receiptPo.getReceiptAmount())) {
                             //确认关联（收款金额=订单应付金额）
-                            log.info(">>>>>>>>>>>>>>>>>>1:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>1--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             receiptPo.setConfirmType(4);
                             relation.setReceiptId(receiptPo.getId());
                             relation.setOrderId(order.getOrderId());
                             relation.setAssociateAmount(receiptPo.getReceiptAmount());
                         } else if (receiptPo.getReceiptAmount() < order.getPayableAmount()) {
                             /*（收款金额<订单应付金额）【默认部分收款确认，自动收款不存在抹平确认】*/
-                            log.info(">>>>>>>>>>>>>>>>>>2:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>2--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             receiptPo.setConfirmType(4);
                             relation.setReceiptId(receiptPo.getId());
                             relation.setOrderId(order.getOrderId());
                             relation.setAssociateAmount(receiptPo.getReceiptAmount());
                         } else if (receiptPo.getReceiptAmount() > order.getPayableAmount()) {
                             /*（收款金额>订单应付金额）【默认大额退款余额，自动不存在抹平】*/
-                            log.info(">>>>>>>>>>>>>>>>>>3:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>3--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             receiptPo.setConfirmType(3);
                             relation.setReceiptId(receiptPo.getId());
                             relation.setOrderId(order.getOrderId());
@@ -308,23 +308,23 @@ public class ReceiptServiceImpl implements ReceiptService {
                         Double totalAssociateAmount = 0d;
                         // 重置应付金额已供重新计算
                         order.setPayableAmount(payAbleAmount);
-                        log.info(">>>>>>>>>>>>>>>>>>setPayableAmount:" + payAbleAmount);
+                        log.info("【线下收款】>>>>>>>>>>setPayableAmount:" + payAbleAmount);
                         order.setPayableAmount(getUnPayMoney(order, false));
-                        log.info("-----------------UnPayMoney:" + getUnPayMoney(order, false));
-                        log.info("-----------------payAbleAmount:" + order.getPayableAmount());
+                        log.info("【线下收款】--------UnPayMoney:" + getUnPayMoney(order, false));
+                        log.info("【线下收款】--------payAbleAmount:" + order.getPayableAmount());
                         if (order.getPayableAmount().equals(receiptPo.getReceiptAmount())) {
                             //确认关联（收款金额=订单应付金额）
-                            log.info(">>>>>>>>>>>>>>>>>>11:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>11--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             statusFlag = "3";
                             receiptStatus = "3";
                         } else if (receiptPo.getReceiptAmount() < order.getPayableAmount()) {
                             /*（收款金额<订单应付金额）*/
-                            log.info(">>>>>>>>>>>>>>>>>>22:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>22--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             statusFlag = "2";
                             receiptStatus = "2";
                         } else if (receiptPo.getReceiptAmount() > order.getPayableAmount()) {
                             /*（收款金额>订单应付金额）*/
-                            log.info(">>>>>>>>>>>>>>>>>>33:" + order.getPayableAmount() + "====" + receiptPo.getReceiptAmount());
+                            log.info("【线下收款】>>>>>>>>33--应付金额:" + order.getPayableAmount() + "，收款金额:" + receiptPo.getReceiptAmount());
                             statusFlag = "3";
                             receiptStatus = "3";
                             totalAssociateAmount += relation.getAssociateAmount();
@@ -363,11 +363,11 @@ public class ReceiptServiceImpl implements ReceiptService {
                         }
                         // 更新订单收款状态
                         payOrderMapper.updateOrderStatus(order);
-                        log.info("-------------审核通过订单状态改变---orderId:" + order.getOrderId() + "--status:" + order.getStatus() + "----------" + receiptPo.getConfirmType());
+                        log.info("【线下收款】-------审核通过订单状态改变---orderId:" + order.getOrderId() + "--status:" + order.getStatus() + "----------" + receiptPo.getConfirmType());
 
                         /* 审核订单关系 */
                         if (null != receiptPo.getConfirmType() && 3 == receiptPo.getConfirmType()) {
-                            log.info(">>>>>>>>>>>>>>>>>>55:" + receiptPo.getReceiptAmount() + "====" + totalAssociateAmount);
+                            log.info("【线下收款】>>>>>>>>>>55:" + receiptPo.getReceiptAmount() + "====" + totalAssociateAmount);
                             // 本次收款减已经收款金额
                             Double money = receiptPo.getReceiptAmount() - totalAssociateAmount;
                             // 加入用户余额
@@ -376,7 +376,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             double userMoney = baseMapper.getUserMoney(order.getUserId());
                             // 可用余额
                             Double availableMoney = baseMapper.getAbleUserMoney(order.getUserId());
-                            log.info("------->userId：" + order.getUserId() + "，原余额：" + userMoney + "==原可用余额：" + availableMoney);
+                            log.info("【线下收款】------->userId：" + order.getUserId() + "，原余额：" + userMoney + "==原可用余额：" + availableMoney);
                             if (money < 0d) {
                                 // 待确认状态不需要修改余额，因为本身存在冻结余额不需要重复退回
                                 if (0 != order.getStatus()) {
@@ -390,9 +390,9 @@ public class ReceiptServiceImpl implements ReceiptService {
                             }
 
                             payOrderMapper.updateUserMoney(userMoney, availableMoney, order.getUserId());
-                            log.info("------->userId：" + order.getUserId() + "，更新余额：" + userMoney + "==更新可用余额：" + availableMoney);
-                            log.info("----------->大额抹平金额退回账户:" + order.getUserId());
-                            log.info("----------->大额抹平金额:" + money);
+                            log.info("【线下收款】------->userId：" + order.getUserId() + "，更新余额：" + userMoney + "==更新可用余额：" + availableMoney);
+                            log.info("【线下收款】------->大额抹平金额退回账户:" + order.getUserId());
+                            log.info("【线下收款】------->大额抹平金额:" + money);
                             //保存余额到余额收支记录
                             BalanceRecordPo balanceRecord = new BalanceRecordPo();
                             balanceRecord.setUserId(order.getUserId());
@@ -575,11 +575,11 @@ public class ReceiptServiceImpl implements ReceiptService {
                         orderList.add(order);
                     }
                 }
-                log.info("--------待确认--------");
+                log.info("【线下收款】-----待确认--------");
             } else {
                 // 已确认
                 orderList = receiptMapper.getReceiptOrders(receipt.getId());
-                log.info("--------已确认--------");
+                log.info("【线下收款】-----已确认--------");
             }
             if (!CollectionUtils.isEmpty(orderList)) {
                 // 用户openid
@@ -706,7 +706,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         try {
             excludeOrderId = Integer.parseInt(receipt.getOrderFlag());
         } catch (NumberFormatException e) {
-            log.info("---------此收款无订单标注------");
+            log.info("【线下收款】------此收款无订单标注------");
         }
         String[] receiptStatusArr = orderReceiptStatus.split(",");
         List<Integer> orderStatus;
@@ -1130,7 +1130,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             } else {
                                 // 设置手动回滚事务
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                log.info("订单（Id：" + order.getOrderId() + "）大额抹平确认--金额不正确！");
+                                log.info("【线下收款】订单（Id：" + order.getOrderId() + "）大额抹平确认--金额不正确！");
                                 return ResponseJson.error("订单（Id：" + order.getOrderId() + "）大额抹平确认--金额不正确！", null);
                             }
                         }
@@ -1150,7 +1150,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             } else {
                                 // 设置手动回滚事务
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                log.info("订单（Id：" + order.getOrderId() + "）大额退款余额--金额不正确！");
+                                log.info("【线下收款】订单（Id：" + order.getOrderId() + "）大额退款余额--金额不正确！");
                                 return ResponseJson.error("订单（Id：" + order.getOrderId() + "）大额退款余额--金额不正确！", null);
                             }
                         }
@@ -1159,7 +1159,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             } else {
                 // 设置手动回滚事务
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                log.info("关联订单为空！");
+                log.info("【线下收款】关联订单为空！");
                 return ResponseJson.error("关联订单为空！", null);
             }
         }
@@ -1185,7 +1185,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 weChatService.sendTemplateMsg(accessToken, openid, associateTitle, associateAmount, associateDate, remarkText, pagePath);
             }
         } catch (Exception e) {
-            log.error("获取微信公众号access_token异常！", e);
+            log.error("【线下收款】获取微信公众号access_token异常！", e);
         }
         return ResponseJson.success("关联收款信息成功！", null);
     }
@@ -1472,12 +1472,12 @@ public class ReceiptServiceImpl implements ReceiptService {
                     if (null == order) {
                         // 设置手动回滚事务
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        log.info("订单（Id：" + relationItem.getOrderId() + "）收款订单为空！");
+                        log.info("【线下收款】订单（Id：" + relationItem.getOrderId() + "）收款订单为空！");
                         return ResponseJson.error("收款订单异常！", null);
                     }
                     Double payAbleAmount = order.getPayableAmount();
                     Double unPayMoney = getUnPayMoney(order, false);
-                    log.info("-----------------UnPayMoney:" + unPayMoney + ", payAbleAmount:" + payAbleAmount);
+                    log.info("【线下收款】-------------UnPayMoney:" + unPayMoney + ", payAbleAmount:" + payAbleAmount);
                     if (unPayMoney.equals(relationItem.getAssociateAmount())) {
                         //确认关联（收款金额=订单应付金额）
                         statusFlag = "3";
@@ -1507,7 +1507,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             }
                             // 设置手动回滚事务
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                            log.info("本条收款进行了" + operating + "操作需要最后审核，请先审核该订单的其他" + i + "条收款");
+                            log.info("【线下收款】本条收款进行了" + operating + "操作需要最后审核，请先审核该订单的其他" + i + "条收款");
                             return ResponseJson.error("本条收款进行了" + operating + "操作需要最后审核，请先审核该订单的其他" + i + "条收款", null);
                         }
                         statusFlag = "3";
@@ -1538,7 +1538,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     }
                     // 更新订单收款状态
                     payOrderMapper.updateOrderStatus(order);
-                    log.info("-------------审核通过订单状态改变---orderId:" + order.getOrderId() + "--status:" + order.getStatus());
+                    log.info("【线下收款】----------审核通过订单状态改变---orderId:" + order.getOrderId() + "--status:" + order.getStatus());
                     //判断是否有充值商品,充值到余额
                     Integer rechargeGoods = null;
                     //缴纳订金订单
@@ -1580,7 +1580,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         // 保存 余额收支记录
                         baseMapper.insertBalanceRecord(balanceRecord);
                         baseMapper.updateUserMoney(userMoney, ableUserMoney, order.getUserId());
-                        log.info("订单商品充值余额>>>>>>>>>>>>>" + relationItem.getAssociateAmount());
+                        log.info("【线下收款】订单商品充值余额>>>>>>>>>>>>>" + relationItem.getAssociateAmount());
                     }
                     if (null != orderReceiptStatus && 3 == orderReceiptStatus) {
                         // 已收款赠送采美豆自主下单赠送采美豆
@@ -1631,7 +1631,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     OrderVo order = orderCommonMapper.getOrderByOrderId(listRelation.get(0).getOrderId());
                     Double userMoney = baseMapper.getUserMoney(order.getUserId());
                     Double ableUserMoney = baseMapper.getAbleUserMoney(order.getUserId());
-                    log.info("----------------------->原余额：" + userMoney + "==原可用余额：" + ableUserMoney);
+                    log.info("【线下收款】----------->原余额：" + userMoney + "==原可用余额：" + ableUserMoney);
                     // 减操作不更新可用余额
                     if (money < 0d) {
                         if (0 != order.getStatus()) {
@@ -1644,7 +1644,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         }
                         ableUserMoney = MathUtil.add(ableUserMoney, money).doubleValue();
                     }
-                    log.info("大额抹平金额退回账户:" + order.getUserId() + ",------->大额抹平金额:" + money);
+                    log.info("【线下收款】大额抹平金额退回账户:" + order.getUserId() + ",------->大额抹平金额:" + money);
                     //保存余额到余额收支记录
                     BalanceRecordPo balanceRecord = new BalanceRecordPo();
                     balanceRecord.setUserId(order.getUserId());
@@ -1659,7 +1659,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     // 保存 余额收支记录
                     baseMapper.insertBalanceRecord(balanceRecord);
                     baseMapper.updateUserMoney(userMoney, ableUserMoney, order.getUserId());
-                    log.info("大额抹平金额退回账户>>>>>>>>>>>>>" + money);
+                    log.info("【线下收款】大额抹平金额退回账户>>>>>>>>>>>>>" + money);
                 }
             } else if (4 == receiptStatus && 2 == receipt.getReceiptStatus()) {
                 //审核不通过
@@ -1667,7 +1667,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             } else {
                 // 设置手动回滚事务
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                log.info("订单不是已确认状态 或者 审核结果不正确");
+                log.info("【线下收款】订单不是已确认状态 或者 审核结果不正确");
                 return ResponseJson.error("审核信息有误！", null);
             }
         }
@@ -1678,7 +1678,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 
         // 审核未通过 推送模板消息给指定人员
         if (4 == receiptStatus) {
-            log.info(">>>>>>>>审核未通过，请重新确认审核！收款Id：" + receipt.getId());
+            log.info("【线下收款】>>>>>>>>审核未通过，请重新确认审核！收款Id：" + receipt.getId());
             try {
                 String accessToken = weChatService.getAccessToken();
                 // 审核未通过
@@ -1697,7 +1697,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     weChatService.sendTemplateMsg(accessToken, openid, title, associateAmount, date, remarkText, pagePath);
                 }
             } catch (Exception e) {
-                log.error("获取微信公众号access_token异常！", e);
+                log.error("【线下收款】获取微信公众号access_token异常！", e);
             }
         }
         return ResponseJson.success("审核收款信息成功！", null);
@@ -1882,7 +1882,9 @@ public class ReceiptServiceImpl implements ReceiptService {
             receipt.setReviewUserName(reviewUserName);
         }
         ReceiptTypeVo type = receiptMapper.getReceiptTypeById(receipt.getPayType());
-        receipt.setPayTypeText(type.getType());
+        if (null != type) {
+            receipt.setPayTypeText(type.getType());
+        }
         receipt.setReceiptTypeText(ReceiptType.getTypeDesc(receipt.getReceiptType()));
         receipt.setReceiptStatusText(ReceiptStatus.getTypeDesc(receipt.getReceiptStatus(), receipt.getReceiptType()));
     }
@@ -2092,7 +2094,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         Double receivedAmount = getReceivedAmount(order, flag);
         Double returnValue = getReturnValue(order);
         unPayMoney = MathUtil.sub(unPayMoney, MathUtil.add(receivedAmount, returnValue)).doubleValue();
-        log.info("------------------剩余应收：" + (unPayMoney >= 0d ? unPayMoney : 0d));
+        log.info("【线下收款】------------剩余应收：" + (unPayMoney >= 0d ? unPayMoney : 0d));
         return unPayMoney >= 0d ? unPayMoney : 0d;
     }