后端、后台管理优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDTO.java

@@ -153,7 +153,7 @@ public class OmsOrderDTO implements Serializable
 //    private Date deliveryTime;
 
     /** 确认收货时间 */
-//    private Date receiveTime;
+    private Date receiveTime;
 
     /** 评价时间 */
     private Date commentTime;
@@ -174,4 +174,8 @@ public class OmsOrderDTO implements Serializable
      * 下单时间
      */
     private Date createTime;
+    /**
+     * 是否评价
+     */
+    private String commentStatus;
 }

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

@@ -40,8 +40,8 @@ public interface GoodsAssessMapper extends BaseMapper<GoodsAssess> {
     @Select("select score from goods where id = #{goodsId}")
     BigDecimal getGoodsAvgScore(Long goodsId);
 
-    @Update("update order_item set comment_status = 'Y' where order_sn = #{orderId} and goods_id = #{goodsId}")
-    void updatePersonalAssessStatus(@Param("orderId") Long orderId, @Param("goodsId") Long goodsId);
+    @Update("update oms_order set comment_status = 'Y' where id = #{orderId}")
+    void updatePersonalAssessStatus(@Param("orderId") Long orderId);
 
     @Select("select * from employee where id = #{id}")
     EmployeeDTO queryEmployeeInfo(@Param("id") Long id);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/OmsOrder.java

@@ -161,4 +161,9 @@ public class OmsOrder extends ModifyEntity<Long>
      * 下单时间
      */
     private Date createTime;
+
+    /**
+     * 是否评价
+     */
+    private String commentStatus;
 }

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

@@ -72,7 +72,7 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
         goodsAssess.setHits(0L);
         goodsAssess.setIsRecover(0);
         this.save(goodsAssess);
-        baseMapper.updatePersonalAssessStatus(param.getOrderId(), param.getGoodsId());
+        baseMapper.updatePersonalAssessStatus(param.getOrderId());
         return goodsAssess.getId();
     }
 

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

@@ -97,7 +97,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
         OmsOrderReturnApply omsOrderReturnApply = OrderReturnApplyCopier.INSTANCE.copying(param);
         omsOrderReturnApply.setCreateTime(new Date());
         this.save(omsOrderReturnApply);
-        this.omsOrderService.updateOrderStatus(param.getOrderId(),6);
+        this.omsOrderService.updateOrderStatus(param.getOrderId(),5);
         this.reservationService.updateStatusByOrderId(param.getOrderId(), ReserveStatus.CANCELED);
         return omsOrderReturnApply.getId();
     }