新需求

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -28,7 +28,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaOrgOrderController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOrgOrderController.class);
@@ -43,17 +43,16 @@ public class TaOrgOrderController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOrgOrder",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOrgOrder",method= RequestMethod.GET)
     public ResponseBean taOrgOrderList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam( value = "orderType", required = false) String orderType,
+                                       @RequestParam( value = "orgId", required = false) Integer orgId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaOrgOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaOrgOrder> result = iTaOrgOrderService.page(pg, queryWrapper);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

@@ -2,8 +2,10 @@ package com.huiju.estateagents.redpack.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import lombok.Data;
@@ -96,5 +98,15 @@ public class TaOrgOrder implements Serializable {
      */
     private String userName;
 
+    @TableField(exist = false)
+    private String miniAppName;
 
+    @TableField(exist = false)
+    private List<String> certificateList;
+
+    @TableField(exist = false)
+    private String auditStatus;
+
+    @TableField(exist = false)
+    private String phone;
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.redpack.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 
 /**
@@ -16,4 +18,20 @@ import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 @Mapper
 public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
 
+    /**
+     * 充值退款订单
+     * @param pg
+     * @param orderType
+     * @return
+     */
+    IPage<TaOrgOrder> orderListByRechargeOrRefund(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
+
+    /**
+     * 消费订单
+     * @param pg
+     * @param orderType
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> orderListByConsume(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
@@ -32,4 +33,12 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @return
      */
     ResponseBean rejectOrder(String id, TaOrgRefundApplication refundApplication, Integer userId);
+
+    /**
+     * 订单列表
+     * @param pg
+     * @param orderType
+     * @return
+     */
+    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
@@ -67,6 +68,20 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Override
+    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId) {
+        IPage<TaOrgOrder> result = null;
+
+        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId);
+            return result;
+        } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)){
+            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId);
+            return result;
+        } else {
+            return null;
+        }
+    }
 
     @Override
     @Transactional(rollbackFor = {RuntimeException.class})

src/main/resources/mapper/redpack/TaH5ImagesMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaH5ImagesMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaH5TemplateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaH5TemplateMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgAccountBlockedMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgAccountCertificateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgAccountDetailedListMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgAccountMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgOrderDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper">
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper">
+
+    <select id="orderListByRechargeOrRefund" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        select
+        t.order_id,
+        t.amount,
+        b.name as miniAppName,
+        t.is_offline,
+        t.create_date,
+        t.trading_status,
+        <if test="orderType == 'recharge' || orderType == 'refund'">
+            d.audit_status,
+            d.audit_result,
+        </if>
+        GROUP_CONCAT(c.url) as certificateList
+        From ta_org_order t
+        left join ta_org_order_detail a on t.order_id = a.order_id
+        left join ta_miniapp b on t.org_id = b.org_id
+        left join ta_org_account_certificate c on t.order_id = c.order_id
+        <if test="orderType == 'recharge' || orderType == 'refund'">
+            left join ta_org_refund_application d on d.org_id = t.org_id
+        </if>
+        where
+        a.item_type = #{orderType}
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        GROUP BY t.order_id
+    </select>
+
+    <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        select
+        t.order_id,
+        b.name as miniAppName,
+        t.amount,
+        t.create_date,
+        ifnull(c.phone, c.tel) as phone,
+        t.trading_status
+        From ta_org_order t
+        left join ta_org_order_detail a on t.order_id = a.order_id
+        left join ta_miniapp b on t.org_id = b.org_id
+        left join ta_person c on a.receiver_id = c.person_id
+        where
+        a.item_type = #{orderType}
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        GROUP BY t.order_id
+    </select>
+
+
+</mapper>

src/main/resources/mapper/redpack/TaOrgRefundApplicationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgRefundApplicationMapper">
+
+</mapper>