用户端代码提交

pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java

@@ -331,4 +331,6 @@ public class TotalOrderVo {
     private String intro;
 
     private String pzRemark;
+
+    private Integer goodsId;
 }

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -199,6 +199,7 @@ public class ArticleServiceImpl implements IArticleService {
 
                 //查询用户收藏的所有文章
                 bo.setArticleId(articleIds);
+                bo.setCityId(null);
                 lqw = buildQueryWrapper(bo);
 
                 result = baseMapper.selectVoPage(pageQuery.build(), lqw);

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -286,6 +286,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             totalOrderVo.setSmallCover(storeGoods.getSmallCover());
             totalOrderVo.setPrice(storeGoods.getSalePrice());
             totalOrderVo.setIntro(storeGoods.getIntro());
+            totalOrderVo.setGoodsId(storeGoods.getId());
 
         }
         return totalOrderVo;
@@ -573,10 +574,12 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             totalOrderBo.setIsRefund(0);
             return this.refundOrder(totalOrderBo);
         }
-/*
-        if(){
 
-        }*/
+        //商城订单已支付未结单取消退款
+        if(totalOrder.getBusinessId() == 0 && totalOrder.getStatus() == 1 && sonOrderSimpleDataByTotalId.getOrderStatus() == 0){
+            totalOrderBo.setIsRefund(0);
+            return this.refundOrder(totalOrderBo);
+        }
 
         if (sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getEmId() == 0 && totalOrder.getStatus() == 0) {// 预约陪诊
             // yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder));
@@ -816,7 +819,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             if (totalOrder.getBusinessId() == 5) {
                 money = totalOrder.getPayMoney();
             } else if (totalOrder.getBusinessId() == 0) {// 商城订单
-
+                money = totalOrder.getPayMoney();
             } else {
                 // 一般陪诊订单
                 // 一般订单开始服务时间

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -75,15 +75,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join company c on c.id = e.company_id
         left join sys_user s on s.user_id = e.uid
         WHERE e.`status` = 1 and e.now_type= 1 and e.del_flag= 0
-        <if test="bo.companyId != null and bo.companyId != ''">
+        <if test="bo.companyId != 0">
             and e.company_id = #{bo.companyId}
         </if>
         GROUP BY
         e.id,
         e.`name`
-        <if test="bo.favorableRate != null and bo.favorableRate != ''">
+        <!--<if test="bo.favorableRate = 0">
             HAVING
             satisfaction_rate >= #{bo.favorableRate};
+        </if>-->
+        <if test="bo.favorableRate == 1">
+            HAVING
+            satisfaction_rate &gt;= 90 and satisfaction_rate &lt;= 100
+        </if>
+        <if test="bo.favorableRate == 2">
+            HAVING
+            satisfaction_rate &gt;= 80 and satisfaction_rate &lt;= 90
+        </if>
+        <if test="bo.favorableRate == 3">
+            HAVING
+            satisfaction_rate &lt;= 80
         </if>
         ORDER BY satisfaction_rate desc
     </select>

pz-system/src/main/resources/mapper/system/StoreOrderMapper.xml

@@ -57,7 +57,7 @@
         </where>
     </select>
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
-        select s.id as sonOrderId  store_order s where order_id = #{totalId}
+        select s.id as sonOrderId, s.status as orderStatus from store_order s where s.order_id = #{totalId}
     </select>