java/zhihuishenqu.git

			@@ -38,7 +38,7 @@
			" sr.wx_tarde_no, sr.status, sr.pay_status, sr.receiver_id, \n" +
			" sr.total_amount, sr.discount_amount, sr.pay_amount, sr.pay_type, \n" +
			" sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company, \n" +
			" sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName \n" +
			" sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName, ss.name as store_name \n" +
			" FROM com_shop_order sr LEFT JOIN com_shop_order_goods og ON sr.id = og.order_id \n" +
			" LEFT JOIN com_shop_goods_attr ga ON og.goods_attr_id = ga.id \n" +
			" LEFT JOIN sys_user su ON sr.user_id = su.user_id \n" +
			@@ -82,12 +82,12 @@
			" AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
			" </if> " +
			" GROUP BY sr.id " +
			" ORDER BY sr.create_at "+
			" ORDER BY sr.create_at DESC "+
			"</script>")
			IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

			@Select("<script> " +
			"SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , count(og.id) AS goods_count, " +
			"SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name separator '\n') AS goods_name , sum(og.amount) AS goods_count, " +
			" su.phone AS account, uad.name AS receiver, uad.phone AS receiverPhone, \n" +
			" concat(uad.province_name, uad.city_name, uad.district_name, uad.detail_address) AS receiver_address, ss.name AS storeName, sr.remark," +
			" CASE\n" +
			@@ -232,7 +232,7 @@
			"<if test='pageComShopFundsSearchDTO.orderNo != null '>" +
			" AND sr.order_no = #{pageComShopFundsSearchDTO.orderNo} " +
			" </if> " +
			" GROUP BY sr.id ORDER BY sr.create_at "+
			" GROUP BY sr.id ORDER BY sr.create_at DESC "+
			"</script>")
			IPage<ComShopFundsOrderVO> pageShopFunds(Page page, @Param("pageComShopFundsSearchDTO") PageComShopFundsSearchDTO pageComShopFundsSearchDTO);