Merge branch 'dev' into 'mp-server-test'

支付后设置支付时间

See merge request quanshu/mp-server!496

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;
@@ -147,7 +148,6 @@ public class ChannelOrderServiceImpl extends
     channelOrder.setPayAmt(orderSettleVO.getPayAmt());
     channelOrder.setStatus(ChannelOrderStatusEnum.NOT_PAY);
     channelOrder.setPkgNum(orderSettleVO.getPkgNum());
-    channelOrder.setPayTime(new Date());
     channelOrder.setMemo(memo);
     channelOrder.setReceiver(addr.getReceiver());
     channelOrder.setTel(addr.getMobile());
@@ -274,6 +274,7 @@ public class ChannelOrderServiceImpl extends
     boolean rst = update(
         new LambdaUpdateWrapper<ChannelOrder>().set(ChannelOrder::getStatus,
                 ChannelOrderStatusEnum.NOT_DELIVER)
+                .set(ChannelOrder::getPayTime, DateUtils.parseDate(payOrder.getCompleteDate()))
             .eq(ChannelOrder::getOrderId, channelOrder.getOrderId())
             .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_PAY));
     if (!rst) {

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.pay.domain.PayOrder;
 import com.qs.mp.system.service.id.BizIdGenerator;
@@ -78,7 +79,6 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     userDeliverOrder.setCity(userAddr.getCity());
     userDeliverOrder.setArea(userAddr.getArea());
     userDeliverOrder.setAddress(userAddr.getAddr());
-    userDeliverOrder.setPayTime(new Date());
     userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
     userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
     userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
@@ -152,6 +152,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
       throw new ServiceException("支付回调用户提货订单处理，订单状态异常，不是待支付。orderId:" + payOrder.getBizId());
     }
     deliverOrder.setStatus(DeliverOrderStatusEnum.NOT_DELIVER);
+      deliverOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
     boolean rst = updateById(deliverOrder);
     Assert.isTrue(rst, "支付回调用户提货订单处理，更新订单状态失败，orderId:" + deliverOrder.getOrderId());
     return false;

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -35,6 +35,7 @@ import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.enums.UserCouponStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.RSAUtil;
 import com.qs.mp.common.utils.StringUtils;
@@ -163,7 +164,6 @@ public class UserTicketOrderServiceImpl extends
     userTicketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     userTicketOrder.setPayAmt(orderSettleVO.getPayAmt());
     userTicketOrder.setTicketNum(orderSettleVO.getOrderNum());
-    userTicketOrder.setPayTime(new Date());
     userTicketOrder.setMemo("");
     userTicketOrder.setResource(TicketTypeEnum.ONLINE);
     userTicketOrder.setCouponInfo(couponIds);
@@ -251,7 +251,6 @@ public class UserTicketOrderServiceImpl extends
     ticketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     ticketOrder.setPayAmt(orderSettleVO.getPayAmt());
     ticketOrder.setTicketNum(1);
-    ticketOrder.setPayTime(new Date());
     ticketOrder.setMemo("");
     ticketOrder.setResource(TicketTypeEnum.OFFLINE);
     ticketOrder.setCouponInfo(couponIds);
@@ -388,6 +387,7 @@ public class UserTicketOrderServiceImpl extends
           JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
       throw new ServiceException("支付回调用户购票订单处理，订单状态异常，不是待支付。orderId:" + payOrder.getBizId());
     }
+    ticketOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
     return processTicketOrder(ticketOrder);
   }
 
@@ -422,6 +422,7 @@ public class UserTicketOrderServiceImpl extends
     boolean updateRst = update(
         new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
                 UserTicketOrderStatusEnum.FINISHED)
+            .set(UserTicketOrder::getPayTime, ticketOrder.getPayTime())
             .eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
             .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
     Assert.isTrue(updateRst, "支付回调用户购票订单处理，更新订单状态失败，orderId:" + ticketOrder.getOrderId());