zhs 3 лет назад
Родитель
Сommit
9d585d6820

+ 12 - 2
src/main/java/com/travel/controller/PrivateOrderController.java

@@ -346,6 +346,16 @@ public class PrivateOrderController {
         return map;
     }
 
+    /**
+     * 满意
+     * @param supplierReleasePlay 参数
+     * @return 返回结果
+     */
+    @PutMapping("satisfiedRelease")
+    public Map<String, Object> satisfiedRelease(@RequestBody SupplierReleasePlay supplierReleasePlay){
+        return privateOrderService.satisfiedRelease(supplierReleasePlay);
+    }
+
     /**
      * 我的收藏
      * @param orderingConllection 参数
@@ -396,8 +406,8 @@ public class PrivateOrderController {
             privateOrderService.reviewRelese(release);
             List<Release> list = privateOrderService.getReleaseHot(release);
             //将所有该定制单的状态改为完成
-//            Release release2 = new Release().setOrderType(5).setDemandUuid(release.getDemandUuid()).setCode(list.get(0).getCode());
-//            privateOrderService.notInterested(release2);
+            Release release2 = new Release().setOrderType(13).setDemandUuid(release.getDemandUuid()).setCode(list.get(0).getCode());
+            privateOrderService.notInterested(release2);
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();

+ 2 - 0
src/main/java/com/travel/mapper/PrivateOrderMapper.java

@@ -75,4 +75,6 @@ public interface PrivateOrderMapper {
     Release getReleaseVal(PrivateOrder privateOrder1);
 
     List<PrivateOrder> updatePrivateFourSomeFarm();
+
+    void satisfiedRelease(SupplierReleasePlay supplierReleasePlay);
 }

+ 12 - 0
src/main/java/com/travel/model/PrivateOrder.java

@@ -176,4 +176,16 @@ public class PrivateOrder implements Serializable {
      * 供应商编号
      */
     private String supplierCode;
+    /**
+     * 退款状态
+     */
+    private String refundState;
+    /**
+     * 供应商编号
+     */
+    private String releCode;
+    /**
+     * 供应商头像
+     */
+    private String releHeadpir;
 }

+ 4 - 0
src/main/java/com/travel/model/SupplierReleasePlay.java

@@ -48,4 +48,8 @@ public class SupplierReleasePlay implements Serializable {
      * 修改内容
      */
     private String updateContent;
+    /**
+     * 满意
+     */
+    private String satisfied;
 }

+ 2 - 0
src/main/java/com/travel/service/PrivateOrderService.java

@@ -73,4 +73,6 @@ public interface PrivateOrderService {
     Release getReleaseVal(PrivateOrder privateOrder1);
 
     List<PrivateOrder> updatePrivateFourSomeFarm();
+
+    Map<String, Object> satisfiedRelease(SupplierReleasePlay supplierReleasePlay);
 }

+ 16 - 0
src/main/java/com/travel/service/impl/PrivateOrderServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -198,4 +199,19 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public List<PrivateOrder> updatePrivateFourSomeFarm() {
         return privateOrderMapper.updatePrivateFourSomeFarm();
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> satisfiedRelease(SupplierReleasePlay supplierReleasePlay) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            privateOrderMapper.satisfiedRelease(supplierReleasePlay);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常,请稍后再试");
+        }
+        return map;
+    }
 }

+ 11 - 3
src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -12,13 +12,13 @@
     <!-- 查询私人订制 -->
     <select id="getPrivate" resultType="PrivateOrder">
         SELECT
-            b.*,c.uuid as uuidRele,c.*,c.order_no as orderNoRelease,a.order_type as orderType,e.name as supplieName,d.refundCount
+            b.*,c.uuid as uuidRele,c.*,c.order_no as orderNoRelease,a.order_type as orderType,e.name as supplieName,d.refundCount,d.refund_state,c.code as releCode,e.headpir as releHeadpir
         FROM
             bus_private_ordering AS b
             JOIN bus_private_ordering_type a on order_type = #{orderType} and b.uuid = a.demand_uuid
             LEFT JOIN bus_supplier_release c ON b.uuid = c.demand_uuid and a.code = c.code
             LEFT JOIN sys_supplier e on c.code = e.code
-            LEFT JOIN (SELECT count(*) as refundCount,release_uuid FROM bus_refund GROUP BY release_uuid) d ON c.uuid = d.release_uuid
+            LEFT JOIN (SELECT count(*) as refundCount,release_uuid,refund_state FROM bus_refund GROUP BY release_uuid,refund_state) d ON c.uuid = d.release_uuid
         <trim prefix="WHERE" prefixOverrides="and | or">
             <if test="uuid != null and uuid != ''">
                 and b.uuid = #{uuid}
@@ -143,7 +143,7 @@
             a.*,b.code as supplieName
         FROM
             bus_private_ordering a
-            JOIN ( SELECT demand_uuid,code FROM bus_private_ordering_type WHERE order_type = '4') b ON a.uuid = b.demand_uuid
+            JOIN ( SELECT demand_uuid,code FROM bus_private_ordering_type WHERE order_type = '4' or order_type = '13') b ON a.uuid = b.demand_uuid
         WHERE CONVERT(date, DateAdd(Day, 7 , a.end_time), 120) <![CDATA[ <= ]]> CONVERT(date, SYSDATETIME(), 120)
     </select>
     <!-- 查询定制单状态里是否存在这一项 -->
@@ -404,4 +404,12 @@
     <select id="getReleaseVal" resultType="Release">
         select * from bus_supplier_release where code = #{supplieName} and demand_uuid = #{uuid}
     </select>
+    <!-- 满意 -->
+    <update id="satisfiedRelease" parameterType="SupplierReleasePlay">
+        update
+            bus_supplier_release_play
+        set satisfied = #{satisfied}
+        where
+            id = #{id} and uuid = #{uuid}
+    </update>
 </mapper>