|
@@ -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();
|