cup 2 years ago
parent
commit
a5cb21735b

+ 7 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -28,6 +28,8 @@ import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 import io.swagger.annotations.ApiResponse;
@@ -315,7 +317,11 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 							deliverOrderExcel.setTel(deliverOrder.getTel());
 							deliverOrderExcel.setDeliveryFlowId(userDeliverOrderItem.getDeliveryFlowId());
 							deliverOrderExcel.setCompanyName(userDeliverOrderItem.getCompanyName());
-							deliverOrderExcel.setGoodsCost(userDeliverOrderItem.getGoodsCost());
+							Integer goodsCost = userDeliverOrderItem.getGoodsCost();
+							if (Objects.isNull(goodsCost)) {
+								goodsCost = 0;
+							}
+							deliverOrderExcel.setGoodsCost(BigDecimal.valueOf(goodsCost).divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP));
 
 							String address = deliverOrder.getProvince() + deliverOrder.getCity()
 									+ deliverOrder.getArea() + deliverOrder.getAddress();

+ 2 - 1
mp-service/src/main/java/com/qs/mp/user/domain/excel/DeliverOrderExcel.java

@@ -3,6 +3,7 @@ package com.qs.mp.user.domain.excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -43,7 +44,7 @@ public class DeliverOrderExcel {
     private Integer goodsNum;
 
     @Excel(name = "商品成本")
-    private Integer goodsCost;
+    private BigDecimal goodsCost;
 
     @Excel(name = "供应商名称")
     private String supplierName;