Quellcode durchsuchen

docs: "换一个单词"

Ritchie vor 1 Jahr
Ursprung
Commit
c9d5c6a174

+ 3 - 0
src/main/java/com/szwl/controller/TAdminController.java

@@ -420,6 +420,9 @@ public class TAdminController {
         String phoneReg = "^1[3-9]\\d{9}$";
         String emailReg = "^[a-zA-Z0-9_-]+([a-zA-Z0-9_.-]*[a-zA-Z0-9])*@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
 
+        if (registerParam.getIfForeign().isEmpty()) {
+            return R.fail(ResponseCodesEnum.A0001, "是否国内外为空!");
+        }
         // 国内用户注册
         if (registerParam.getIfForeign().equals("0")) {
             // 判断 phoneOrEmail 是手机号还是邮箱

+ 4 - 4
src/main/java/com/szwl/controller/TOrderController.java

@@ -232,7 +232,7 @@ public class TOrderController {
                             // 退款数量
                             orderDetail.setRefundQuantity(productNumber);
                             // 退款金额
-                            orderDetail.setRefundAmout(orderDetail.getPrice().multiply(new BigDecimal(productNumber)));
+                            orderDetail.setRefundAmount(orderDetail.getPrice().multiply(new BigDecimal(productNumber)));
                             payFeign.updateOrderDetails(orderDetail);
                         }
                     }
@@ -267,7 +267,7 @@ public class TOrderController {
                             // 退款数量
                             orderDetail.setRefundQuantity(productNumber);
                             // 退款金额
-                            orderDetail.setRefundAmout(orderDetail.getPrice().multiply(new BigDecimal(productNumber)));
+                            orderDetail.setRefundAmount(orderDetail.getPrice().multiply(new BigDecimal(productNumber)));
                             payFeign.updateOrderDetails(orderDetail);
                         }
                     }
@@ -436,7 +436,7 @@ public class TOrderController {
                         // 退款数量
                         orderDetail.setRefundQuantity(orderDetail.getProductNumber());
                         // 退款金额
-                        orderDetail.setRefundAmout(orderDetail.getAmount());
+                        orderDetail.setRefundAmount(orderDetail.getAmount());
                         payFeign.updateOrderDetails(orderDetail);
                     }
                     return ResponseEntity
@@ -477,7 +477,7 @@ public class TOrderController {
                         // 退款数量
                         orderDetail.setRefundQuantity(orderDetail.getProductNumber());
                         // 退款金额
-                        orderDetail.setRefundAmout(orderDetail.getAmount());
+                        orderDetail.setRefundAmount(orderDetail.getAmount());
                         payFeign.updateOrderDetails(orderDetail);
                     }
                     order.setRefundTrxNo(String.valueOf(refusePrice));

+ 1 - 1
src/main/java/com/szwl/model/entity/TOrderDetails.java

@@ -58,7 +58,7 @@ public class TOrderDetails implements Serializable {
     private Integer refundQuantity;
 
     @ApiModelProperty(value = "退款金额")
-    private BigDecimal refundAmout;
+    private BigDecimal refundAmount;
 
     @ApiModelProperty(value = "退款状态,0:未支付,1:已支付,2:部分退款,3:已退款,4:退款中")
     private String refundStatus;