Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-17 60629b0a001a9a0863a9f216ed14485b80623ce5

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java

@@ -11,9 +11,9 @@


/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表实体类
 * @auther cedoo
 * @create 2021-4-17 17:54:27
 * @describe 订单表搜索结果类
 */

@Data

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java

@@ -36,24 +36,14 @@
    IPage<ComShopOrderPageVO> pageOrderList(Page page,@Param("comOrderListDTO") PageComOrderListDTO comOrderListDTO);

    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "`name`,\n" +
            "photo_path,\n" +
            "phone,\n" +
            "integral,\n" +
            "create_at \n" +
            "FROM\n" +
            "com_mng_volunteer_mng \n" +
            " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
            " </if> " +
            " order by integral desc,create_at desc"+
            "SELECT   ordr.id, ordr.store_id, ordr. user_id, ordr.order_no, ordr.pay_no, \n" +
            "    ordr.wx_tarde_no, ordr.status, ordr.pay_status, ordr.receiver_id, \n" +
            "    ordr.total_amount, ordr.discount_amount, ordr.pay_amount, ordr.pay_type,  \n" +
            "    ordr.pay_time, ordr.delivery_type, ordr.delivery_status, ordr.logistics_company, \n" +
            "    ordr.logistics_no, ordr.create_at  \n" +
            " FROM  com_shop_order ordr LEFT JOIN com_shop_order_goods goods ON ordr.id = goods.order_id \n" +
            " order by create_at desc"+
            "</script>")
    IPage<ComShopOrderVO> pageOrderBy(PageDTO page, PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
    IPage<ComShopOrderVO> pageOrderBy(PageDTO page,@Param("pageComShopOrderSearchDTO")  PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

}