| @@ -18,5 +18,7 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper<NeuPosOrderMaster | |||||
| List<Map> selectShopList(@Param("orgId") Integer orgId); | List<Map> selectShopList(@Param("orgId") Integer orgId); | ||||
| List<Map> selectPayTypeList(); | List<Map> selectPayTypeList(); | ||||
| List<Map> queryOrderList(NeuPosOrderMasterExt example); | |||||
| } | } | ||||
| @@ -13,4 +13,7 @@ public interface NeuPosOrderService { | |||||
| List<Map> selectShopList(Integer orgId); | List<Map> selectShopList(Integer orgId); | ||||
| List<Map> selectPayTypeList(); | |||||
| List<Map> queryOrderList(NeuPosOrderMasterExt example); | |||||
| } | } | ||||
| @@ -54,5 +54,15 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { | |||||
| } | } | ||||
| return relist; | return relist; | ||||
| } | } | ||||
| @Override | |||||
| public List<Map> selectPayTypeList() { | |||||
| return posOrderMapper.selectPayTypeList(); | |||||
| } | |||||
| @Override | |||||
| public List<Map> queryOrderList(NeuPosOrderMasterExt example) { | |||||
| return posOrderMapper.queryOrderList(example); | |||||
| } | |||||
| } | } | ||||
| @@ -61,4 +61,24 @@ | |||||
| select pay_type,name from `trade_pay_type_dict` | select pay_type,name from `trade_pay_type_dict` | ||||
| </select> | </select> | ||||
| <select id="queryOrderList" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> | |||||
| SELECT order_number as orderNumber, serial_no as serialNo, order_amount as orderAmount,real_pay_amount as realPayAmount, | |||||
| discount_amount as discountAmount, pay_type as payType,paid_time as paidTime,order_status as orderStatus | |||||
| from order_master | |||||
| where order_status = 2 and order_type != '3' | |||||
| <if test=" orgId != null"> | |||||
| and org_id = #{orgId} | |||||
| </if> | |||||
| <if test=" shopId != null"> | |||||
| and shop_id = #{shopId} | |||||
| </if> | |||||
| <if test=" createBegin != null"> | |||||
| and created_at >= #{createBegin} | |||||
| </if> | |||||
| <if test=" createEnd != null"> | |||||
| and created_at <= #{createEnd} | |||||
| </if> | |||||
| ORDER BY created_at desc | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||