ソースを参照

金额大小修改

licailing 5 年 前
コミット
9254ad5a50

+ 1 - 1
src/main/java/com/izouma/dingdong/domain/User.java

@@ -93,7 +93,7 @@ public class User extends BaseEntity implements Serializable {
 //    private BigDecimal consumption;
 
     //用于商家/骑手体现
-    @Column(precision = 10, scale = 2)
+    @Column(precision = 14, scale = 2)
     @ApiModelProperty(value = "余额", name = "money")
     private BigDecimal money;
 

+ 1 - 0
src/main/java/com/izouma/dingdong/domain/Verified.java

@@ -26,6 +26,7 @@ public class Verified extends BaseEntity {
     @ApiModelProperty(value = "真实姓名", name = "realName")
     private String realName;
 
+//    @Pattern(regexp = Constants.Regex.ID_NO)
     @ApiModelProperty(value = "身份证号", name = "idNo")
     private String idNo;
 

+ 4 - 0
src/main/java/com/izouma/dingdong/service/OrderRefundApplyService.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 
 
@@ -262,6 +263,9 @@ public class OrderRefundApplyService {
 //        BigDecimal subtractDelivery = orderInfo.getGoodsAmount();
         //平台抽成 (实付金额减运费)
         BigDecimal platform = subtractDelivery.multiply(commission);
+//        System.out.println(platform);
+        platform = platform.setScale(2, RoundingMode.DOWN);
+//        System.out.println(platform);
 
         //商家应得 = 减去骑手应得,减去平台抽成
         BigDecimal deserve = subtractDelivery.subtract(platform);

+ 6 - 0
src/test/java/com/izouma/dingdong/service/OrderInfoServiceTest.java

@@ -3,6 +3,7 @@ package com.izouma.dingdong.service;
 import com.izouma.dingdong.dto.UserOrderDTO;
 import com.izouma.dingdong.enums.PayMethod;
 import com.izouma.dingdong.enums.RefundReason;
+import com.izouma.dingdong.enums.RiderStatus;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,5 +56,10 @@ public class OrderInfoServiceTest {
         orderInfoService.toCompleted(2177L);
     }
 
+    @Test
+    public void testMandatory(){
+        orderInfoService.mandatory(2027L, RiderStatus.CARRY_OUT);
+    }
+
 
 }