11.21 消息推送

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -206,7 +206,7 @@ public class CashRefundServiceImpl implements RefundService {
         message.setStatus(cashRecordRefund.getStatus());
         message.setDesc(cashRecordRefund.getJwcode()+"用户有条退款订单需审核");
         message.setTitle("现金退款--新增退款");
-        message.setType(1);
+        message.setType(0);
         message.setTypeId(cashRecordRefund.getId());
         message.setMarket(Integer.valueOf(cashRecordRefund.getMarket()));
         rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message);

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -173,7 +173,7 @@
                and crr.status = #{status}
             </if>
         <if test="name != null and name.length() > 0">
-            and crr.name = #{name}
+            and crr.name like CONCAT('%', #{name}, '%')
         </if>
         <if test="jwcode != null">
             and crr.jwcode = #{jwcode}
@@ -250,7 +250,7 @@
                 and crr.status = #{status}
             </if>
             <if test="name != null and name.length() > 0">
-                and crr.name = #{name}
+                and crr.name like CONCAT('%', #{name}, '%')
             </if>
             <if test="jwcode != null">
                 and crr.jwcode = #{jwcode}
@@ -271,11 +271,14 @@
                 AND crc.payment_currency LIKE CONCAT('%', #{paymentCurrency}, '%')
             </if>
 
-            <if test="goodsNames!= null and goodsNames.size > 0">
-                AND crc.goods_name IN
-                <foreach collection="goodsNames" item="goodsNames" open="(" separator="," close=")">
-                    #{goodsNames}
-                </foreach>
+<!--            <if test="goodsNames!= null and goodsNames.size > 0">-->
+<!--                AND crc.goods_name IN-->
+<!--                <foreach collection="goodsNames" item="goodsNames" open="(" separator="," close=")">-->
+<!--                    #{goodsNames}-->
+<!--                </foreach>-->
+<!--            </if>-->
+            <if test="goodsName!= null and goodsName.length() > 0">
+                and crc.goods_name = #{goodsName}
             </if>
             <if test="payType != null and payType.length()>0">
                 and crc.pay_type = #{payType}
@@ -337,7 +340,7 @@
                 and crr.status = #{status}
             </if>
             <if test="name != null and name.length() > 0">
-                and crr.name = #{name}
+                and crr.name like CONCAT('%', #{name}, '%')
             </if>
             <if test="jwcode != null">
                 and crr.jwcode = #{jwcode}

src/main/resources/cashMapper/MessageMapper.xml

@@ -10,6 +10,7 @@
         SELECT id, jwcode, name, title, `desc`, status, market,type, type_id,flag,cz_time
         FROM message
         <where>
+            flag=0
             <choose>
                 <when test="markets != null and markets.size() > 0">
                     market IN
@@ -18,6 +19,14 @@
                     </foreach>
                 </when>
             </choose>
+            <choose>
+                <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                    ORDER BY ${sortField} ${sortOrder}
+                </when>
+                <otherwise>
+                    ORDER BY crr.create_time DESC
+                </otherwise>
+            </choose>
         </where>
     </select>
 </mapper>