Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -436,7 +436,7 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String typeFlag;
-    
+
     /**
      * 评价标识(1司机2货主)
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -167,13 +167,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setCountFa(String.valueOf(count));
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
-                    .eq("satisfaction", "5")
+                    .gt("satisfaction", "4")
                     .eq("evaluatored_id", commonId));
             orderInfo.setHaoPing(evaluateInfoCount);
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "1")
                     .eq("evaluatored_id", commonId));
             orderInfo.setChaPing(evaluateInfoCount1);
+            //好评率
             if (evaluateInfoCount >= 20 && count != 0) {
                 hao = String.valueOf(evaluateInfoCount / count * 100 + "%");
             }
@@ -195,13 +196,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setCountFa(String.valueOf(count));
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
-                    .eq("satisfaction", "5")
+                    .gt("satisfaction", "4")
                     .eq("evaluatored_id", commonId));
             orderInfo.setHaoPing(evaluateInfoCount);
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
                     .eq("satisfaction", "1")
                     .eq("evaluatored_id", commonId));
             orderInfo.setChaPing(evaluateInfoCount1);
+            //好评率
             if (evaluateInfoCount >= 20 && count != 0) {
                 hao = String.valueOf(evaluateInfoCount / count * 100 + "%");
             }