Merge remote-tracking branch 'origin/dev' into dev

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/OrderApiServiceImpl.java

@@ -37,6 +37,7 @@ import com.xingxi.common.mq.bo.order.OrderBO;
 import com.xingxi.common.mq.publisher.order.OrderCreatedMqPublisher;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.PageUtils;
+import com.xingxi.common.utils.RMBUtil;
 import com.xingxi.common.utils.StringUtils;
 import com.xingxi.common.utils.bean.BeanUtils;
 import com.xingxi.common.utils.uuid.IdUtils;
@@ -136,7 +137,8 @@ class OrderApiServiceImpl implements OrderServiceI {
                 for (OrderDetail orderDetail : orderDetailList) {
                     OrderDetailDTO odDto = new OrderDetailDTO();
                     BeanUtils.copyBeanProp(odDto, orderDetail);
-
+                    odDto.setOrderAmount(RMBUtil.fenToYuan(odDto.getOrderAmount()));
+                    odDto.setPayAmount(RMBUtil.fenToYuan(odDto.getPayAmount()));
                     ProdPic condPic = new ProdPic();
                     condPic.setProdId(orderDetail.getProdId());
                     condPic.setDelFlag(EDelFlag.NO.getVal());
@@ -150,7 +152,8 @@ class OrderApiServiceImpl implements OrderServiceI {
                 }
                 OrderDTO dto = new OrderDTO();
                 BeanUtils.copyBeanProp(dto,order);
-
+                dto.setOrderAmount(RMBUtil.fenToYuan(dto.getOrderAmount()));
+                dto.setPayAmount(RMBUtil.fenToYuan(dto.getPayAmount()));
                 dto.setOrderDetailDTOS(odDtoList);
 
                 orderDTOList.add(dto);
@@ -394,7 +397,8 @@ class OrderApiServiceImpl implements OrderServiceI {
         Order order = wxApiOrderMapper.selectOrderByOrderId(orderId);
 
         BeanUtils.copyProperties(order,rtn);
-
+        rtn.setOrderAmount(RMBUtil.fenToYuan(rtn.getOrderAmount()));
+        rtn.setPayAmount(RMBUtil.fenToYuan(rtn.getPayAmount()));
         List<OrderDetailDTO> detailDTOList = new ArrayList<>();
 
         OrderDetail condOrderDetail = new OrderDetail();
@@ -405,6 +409,8 @@ class OrderApiServiceImpl implements OrderServiceI {
         for (OrderDetail orderDetail : orderDetailList) {
             OrderDetailDTO dto = new OrderDetailDTO();
             BeanUtils.copyProperties(orderDetail,dto);
+            dto.setOrderAmount(RMBUtil.fenToYuan(dto.getOrderAmount()));
+            dto.setPayAmount(RMBUtil.fenToYuan(dto.getPayAmount()));
 
             ProdPic condPic = new ProdPic();
             condPic.setProdId(orderDetail.getProdId());