评价、退款优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OrderReturnApplyModifyParam.java

@@ -34,9 +34,6 @@ public class OrderReturnApplyModifyParam implements Serializable
     /** 收货地址表id */
     private Long companyAddressId;
 
-    /** 退货商品id */
-    private Long goodsId;
-
     /** 订单编号 */
     private String orderSn;
 
@@ -55,28 +52,6 @@ public class OrderReturnApplyModifyParam implements Serializable
     /** 处理时间 */
     private Date handleTime;
 
-    /** 商品图片 */
-
-    private String goodsPic;
-
-    /** 商品名称 */
-    private String goodsName;
-
-    /** 商品品牌 */
-    private String goodsBrand;
-
-    /** 商品销售属性：颜色：红色；尺码：xl; */
-    private String goodsAttr;
-
-    /** 退货数量 */
-    private Long goodsCount;
-
-    /** 商品单价 */
-    private BigDecimal goodsPrice;
-
-    /** 商品实际支付单价 */
-    private BigDecimal goodsRealPrice;
-
     /** 原因 */
     private String reason;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/BalanceDetailMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Mapper
@@ -20,6 +21,5 @@ public interface BalanceDetailMapper extends BaseMapper<BalanceDetail> {
 
     IPage<BalanceDetailDTO> queryByUserId(@Param("page") Page<BalanceDetailDTO> page, @Param(Constants.WRAPPER) QueryWrapper<BalanceDetail> queryWrapper);
 
-    WalletDTO getMerchantAsset(@Param("merchantId") Long merchantId, @Param("midnight") LocalDateTime midnight,
-                               @Param("yesterdayMidnight") LocalDateTime yesterdayMidnight);
+    WalletDTO getMerchantAsset(@Param("merchantId") Long merchantId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/AssessServiceImpl.java

@@ -74,16 +74,16 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
         Session user = SessionContextHolder.getSession();
         AssertUtils.available(this.getOne(new QueryWrapper<GoodsAssess>().eq("order_id", param.getOrderId()).eq(
                 "creator", user.getId())) == null, "该订单已评价");
-        GoodsAssess goodsAssess = GoodsAssessCopier.INSTANCE.copying(param);
         List<OmsOrderItemDTO> orderItems = this.omsOrderItemService.getOrderItemByOrderId(param.getOrderId());
         List<GoodsAssess> goodsAssessList = new ArrayList<>();
-        goodsAssess.setHits(0L);
-        goodsAssess.setIsRecover(0);
          if (CollectionUtils.isEmpty(orderItems)){
              return null;
          }else{
              for (OmsOrderItemDTO omsOrderItem:orderItems){
+                 GoodsAssess goodsAssess = GoodsAssessCopier.INSTANCE.copying(param);
                  goodsAssess.setGoodsId(omsOrderItem.getGoodsId());
+                 goodsAssess.setHits(0L);
+                 goodsAssess.setIsRecover(0);
                  goodsAssessList.add(goodsAssess);
              }
          }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/BalanceDetailServiceImpl.java

@@ -59,11 +59,11 @@ public class BalanceDetailServiceImpl extends ServiceImpl<BalanceDetailMapper, B
 
     @Override
     public WalletDTO getMerchantAsset(Long merchantId) {
-        LocalDate today = LocalDate.now(); // 获取今天的日期
-        LocalDateTime midnight = LocalDateTime.of(today, LocalTime.MIDNIGHT); // 获取今天凌晨的时间
-        LocalDate yesterday = today.minusDays(1);
-        LocalDateTime yesterdayMidnight = LocalDateTime.of(yesterday, LocalTime.MIN);
-        return merchantBalanceDetailMapper.getMerchantAsset(merchantId, midnight, yesterdayMidnight);
+//        LocalDate today = LocalDate.now(); // 获取今天的日期
+//        LocalDateTime midnight = LocalDateTime.of(today, LocalTime.MIDNIGHT); // 获取今天凌晨的时间
+//        LocalDate yesterday = today.minusDays(1);
+//        LocalDateTime yesterdayMidnight = LocalDateTime.of(yesterday, LocalTime.MIN);
+        return merchantBalanceDetailMapper.getMerchantAsset(merchantId);
     }
 
     public QueryWrapper<BalanceDetail> queryWrapper(QueryMerchantBalanceParam param, Long merchantId, Integer type) {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -97,6 +97,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
     {
         OmsOrderReturnApply omsOrderReturnApply = OrderReturnApplyCopier.INSTANCE.copying(param);
         omsOrderReturnApply.setCreateTime(new Date());
+        omsOrderReturnApply.setHandleTime(new Date());
         OmsOrder omsOrder = this.omsOrderService.getById(param.getOrderId());
         if (null != omsOrder){
             omsOrderReturnApply.setReturnAmount(omsOrder.getPayAmount());
@@ -104,6 +105,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
             omsOrderReturnApply.setReturnName(userDTO.getNickname());
             omsOrderReturnApply.setReturnPhone(userDTO.getMobile());
             omsOrderReturnApply.setStatus(0L);
+
         }
         this.save(omsOrderReturnApply);
         this.omsOrderService.updateOrderStatus(param.getOrderId(),5);

vehicle-server/src/main/resources/mapper/BalanceDetailMapper.xml

@@ -5,8 +5,8 @@
     <select id="getMerchantAsset" resultType="com.chelvc.cloud.vehicle.client.dto.WalletDTO">
         SELECT
             SUM(operate_amount) as totalEarnings,
-            SUM(CASE WHEN create_time >= #{midnight} THEN operate_amount ELSE 0 END) as todayEarnings,
-            SUM(CASE WHEN create_time >= #{yesterdayMidnight} and create_time <![CDATA[ < ]]> #{midnight} THEN operate_amount ELSE 0 END) as yesterdayEarnings
+            SUM(CASE WHEN DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT( CURDATE(), '%Y%m%d' ) THEN operate_amount ELSE 0 END) as todayEarnings,
+            SUM(CASE WHEN DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT( CURDATE()- 1, '%Y%m%d' )  THEN operate_amount ELSE 0 END) as yesterdayEarnings
         FROM
             balance_detail
         WHERE

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -954,7 +954,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryOrderManage" resultType="com.chelvc.cloud.vehicle.client.dto.OrderDTO">
         SELECT
             count(if(status = 3,true,null)) as verifyNum,
-            SUM(CASE WHEN status = 4 THEN pay_amount ELSE 0 END) as verifyAmount,
+            SUM(CASE WHEN status = 3 THEN pay_amount ELSE 0 END) as verifyAmount,
             count(CASE WHEN status in (1,2) THEN true ELSE null END) as awaitNum,
             SUM(CASE WHEN status in (1,2) THEN pay_amount ELSE 0 END) as awaitAmount
         FROM