优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserTicketOrderMgrController.java

@@ -29,6 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -132,6 +134,16 @@ public class UserTicketOrderMgrController extends BaseApiController {
         List<UserTicketOrderExcel> excelList = userTicketOrderListVOList.stream().map(userTicketOrderListVO -> {
             UserTicketOrderExcel userTicketOrderExcel = new UserTicketOrderExcel();
             BeanUtils.copyProperties(userTicketOrderListVO, userTicketOrderExcel);
+            if (Objects.nonNull(userTicketOrderListVO.getSalePrice())) {
+                userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getSalePrice()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+            }
+            if (Objects.nonNull(userTicketOrderListVO.getDiscountAmt())) {
+                userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getDiscountAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+            }
+            if (Objects.nonNull(userTicketOrderListVO.getPayAmt())) {
+                userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getPayAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+            }
+
             if (Objects.nonNull(userTicketOrderListVO.getStatus())) {
                 userTicketOrderExcel.setStatus(userTicketOrderListVO.getStatus().getDesc());
             }

mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderExcel.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -32,7 +33,7 @@ public class UserTicketOrderExcel {
     private String boxType;
 
     @Excel(name = "盲票售价")
-    private Integer salePrice;
+    private BigDecimal salePrice;
 
     @Excel(name = "购买数量")
     private Integer ticketNum;
@@ -41,10 +42,10 @@ public class UserTicketOrderExcel {
     private String status;
 
     @Excel(name = "优惠金额")
-    private Integer discountAmt;
+    private BigDecimal discountAmt;
 
     @Excel(name = "实付金额")
-    private Integer payAmt;
+    private BigDecimal payAmt;
 
     @Excel(name = "用户昵称")
     private String nickName;

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.qs.mp.admin.domain.param.ChannelOrderCancelParam;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.admin.service.ITicketPackageService;
 import com.qs.mp.common.enums.PayOrderStatusEnum;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.pay.service.IPayOrderService;
 import com.qs.mp.pay.service.IWalletService;
 import com.qs.mp.user.domain.UserAddr;
@@ -273,7 +274,7 @@ public class ChannelOrderServiceImpl extends
     boolean rst = update(
         new LambdaUpdateWrapper<ChannelOrder>().set(ChannelOrder::getStatus,
                 ChannelOrderStatusEnum.NOT_DELIVER)
-                .set(ChannelOrder::getPayTime, payOrder.getCompleteDate())
+                .set(ChannelOrder::getPayTime, DateUtils.parseDate(payOrder.getCompleteDate()))
             .eq(ChannelOrder::getOrderId, channelOrder.getOrderId())
             .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_PAY));
     if (!rst) {