订单评价

src/main/java/com/mmc/oms/controller/lease/LeaseOrderController.java

@@ -8,6 +8,7 @@ import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.lease.AddLeaseOrderVO;
 import com.mmc.oms.model.vo.lease.LeaseOrderRefundVO;
 import com.mmc.oms.model.vo.uav.UavOrderExpressVO;
+import com.mmc.oms.model.vo.uav.UavOrderRemarkVO;
 import com.mmc.oms.service.lease.LeaseOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -117,8 +118,16 @@ public class LeaseOrderController extends BaseController {
     @ApiOperation(value = "小程序确认结算")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("confirmSettlement")
-    public ResultBody confirmSettlement(@RequestParam Integer id, HttpServletRequest request) throws Exception {
+    public ResultBody confirmSettlement(@RequestParam Integer id, HttpServletRequest request) {
         return leaseOrderService.confirmSettlement(id, this.getCurrentAccount(request));
     }
 
+    @ApiOperation(value = "评价订单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("remarkOrder")
+    public ResultBody remarkOrder(@RequestBody UavOrderRemarkVO uavOrderRemarkVO) {
+        return leaseOrderService.remarkOrder(uavOrderRemarkVO);
+    }
+
+
 }

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -5,6 +5,7 @@ import com.mmc.oms.entity.lease.LeaseOrderExpressDO;
 import com.mmc.oms.entity.lease.LeaseRefundOrderDO;
 import com.mmc.oms.entity.transtatus.TranStatusDicDO;
 import com.mmc.oms.entity.uav.UavOrderDO;
+import com.mmc.oms.entity.uav.UavOrderRemarkDO;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -49,4 +50,7 @@ public interface LeaseOrderDao {
 
     LeaseRefundOrderDO selectGiveBackByOrderId(Integer id, Integer type);
 
+    void updateLeaseOrderRemarkStatus(Integer id);
+
+    void addRemarkOrder(UavOrderRemarkDO uavOrderRemarkDO);
 }

src/main/java/com/mmc/oms/service/lease/LeaseOrderService.java

@@ -7,6 +7,7 @@ import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.lease.AddLeaseOrderVO;
 import com.mmc.oms.model.vo.lease.LeaseOrderRefundVO;
 import com.mmc.oms.model.vo.uav.UavOrderExpressVO;
+import com.mmc.oms.model.vo.uav.UavOrderRemarkVO;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -42,4 +43,6 @@ public interface LeaseOrderService {
     ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param);
 
     ResultBody confirmSettlement(Integer id, BaseAccountDTO currentAccount);
+
+    ResultBody remarkOrder(UavOrderRemarkVO uavOrderRemarkVO);
 }

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.mmc.oms.entity.lease.LeaseOrderExpressDO;
 import com.mmc.oms.entity.lease.LeaseRefundOrderDO;
 import com.mmc.oms.entity.mall.UserAddressDO;
 import com.mmc.oms.entity.transtatus.TranStatusDicDO;
+import com.mmc.oms.entity.uav.UavOrderRemarkDO;
 import com.mmc.oms.enums.LeaseOrderStatus;
 import com.mmc.oms.enums.LeaseTermInfo;
 import com.mmc.oms.enums.OrderType;
@@ -40,6 +41,7 @@ import com.mmc.oms.model.vo.lease.LeasePriceStockVO;
 import com.mmc.oms.model.vo.uav.GoodsResourcesVO;
 import com.mmc.oms.model.vo.uav.PayUavWalletVO;
 import com.mmc.oms.model.vo.uav.UavOrderExpressVO;
+import com.mmc.oms.model.vo.uav.UavOrderRemarkVO;
 import com.mmc.oms.service.demand.DemandReleaseOrderService;
 import com.mmc.oms.service.lease.LeaseOrderService;
 import com.mmc.oms.service.uav.UavOrderService;
@@ -870,4 +872,21 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         // 进行平台打款
         return businessIncome(currentAccount, id, leaseOrderDO);
     }
+
+    @Override
+    public ResultBody remarkOrder(UavOrderRemarkVO uavOrderRemarkVO) {
+        LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(uavOrderRemarkVO.getUavOrderId());
+        if (!leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.REMAIN_TO_BE_EVALUATED.getCode())) {
+            return ResultBody.error("状态流程有误");
+        }
+        // 修改订单状态
+        this.updateLeaseOrderStatus(uavOrderRemarkVO.getUavOrderId(), LeaseOrderStatus.COMPLETE_TRANSACTION);
+        leaseOrderDao.updateLeaseOrderRemarkStatus(leaseOrderDO.getId());
+        // 填入评价内容
+        UavOrderRemarkDO uavOrderRemarkDO = new UavOrderRemarkDO(uavOrderRemarkVO);
+        uavOrderRemarkDO.setRemarkType(1);
+        uavOrderRemarkDO.setMallGoodsId(leaseOrderDO.getId());
+        leaseOrderDao.addRemarkOrder(uavOrderRemarkDO);
+        return ResultBody.success();
+    }
 }

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -47,6 +47,11 @@
                                        #{modified_deposit})
         values (#{leaseOrderId}, #{status}, #{file}, #{reason}, #{type}, #{leaseOrderExpressId}, #{modifiedDeposit})
     </insert>
+    <insert id="addRemarkOrder">
+        insert into uav_order_remark (remark_type, mall_goods_id, uav_order_id, remark_level, uav_images, content,
+                                      create_time)
+        values (#{remarkType}, #{mallGoodsId}, #{uavOrderId}, #{remarkLevel}, #{uavImages}, #{content}, NOW())
+    </insert>
     <update id="updateLeaseOrderStatus">
         update lease_order
         set status_code = #{code}
@@ -111,6 +116,11 @@
         set proportion = #{proportion}
         where id = #{id}
     </update>
+    <update id="updateLeaseOrderRemarkStatus">
+        update lease_order
+        set remark_status = 1
+        where id = #{id}
+    </update>
 
     <sql id="lease_order_column">
         id