ReceiptStatusText

src/main/java/com/caimei365/order/model/enums/ReceiptStatus.java

@@ -22,7 +22,7 @@ public enum ReceiptStatus {
     public static String getTypeDesc(Integer code, Integer receiptType) {
         for (ReceiptStatus type : ReceiptStatus.values()) {
             if (type.getCode() == code) {
-                boolean flag = code == YIQUEREN.getCode() && (receiptType == ReceiptType.FEIDINGDAN.getCode() || receiptType == ReceiptType.SHOPREFUND.getCode());
+                boolean flag = code == YIQUEREN.getCode() && (receiptType == ReceiptType.FEIDINGDAN.getCode() || receiptType == ReceiptType.FANYONG.getCode() || receiptType == ReceiptType.SHOPREFUND.getCode());
                 if (flag) {
                     return "已确认";
                 }

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

@@ -592,6 +592,9 @@ public class ReceiptServiceImpl implements ReceiptService {
             return ResponseJson.error("无权限操作！", null);
         }
         ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
+        if (null != receipt) {
+            setReceiptDetail(receipt);
+        }
         return ResponseJson.success(receipt);
     }
 
@@ -606,6 +609,9 @@ public class ReceiptServiceImpl implements ReceiptService {
             return ResponseJson.error("无权限操作！", null);
         }
         ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
+        if (null != receipt) {
+            setReceiptDetail(receipt);
+        }
         return ResponseJson.success(receipt);
     }