Merge remote-tracking branch 'origin/dev' into dev

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

@@ -34,7 +34,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/channel")
+@RequestMapping("/api")
 public class TaOrgAccountController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOrgAccountController.class);
@@ -145,7 +145,7 @@ public class TaOrgAccountController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/api/taOrgAccount/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOrgAccount/{id}",method= RequestMethod.GET)
     public ResponseBean taOrgAccountGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -162,7 +162,7 @@ public class TaOrgAccountController extends BaseController {
      * 系统账户充值
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/channel/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
     public ResponseBean taOrgAccountRecharge(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
                                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -185,7 +185,7 @@ public class TaOrgAccountController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/taOrgAccount/refund/{id}")
+    @RequestMapping(value = "/channel/taOrgAccount/refund/{id}",method= RequestMethod.PUT)
     public ResponseBean taOrgAccountRefund(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -208,7 +208,7 @@ public class TaOrgAccountController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/taOrgOrder/refund/{id}")
+    @RequestMapping(value = "/channel/taOrgOrder/refund/{id}",method= RequestMethod.PUT)
     public ResponseBean taOrgOrderRefund(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -230,7 +230,7 @@ public class TaOrgAccountController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/taOrgOrder/reject/{id}")
+    @RequestMapping(value = "/channel/taOrgOrder/reject/{id}")
     public ResponseBean taOrgOrderReject(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

@@ -1,8 +1,14 @@
 package com.huiju.estateagents.redpack.controller;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,8 +22,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import com.huiju.estateagents.service.ITaPersonService;
 
 /**
  * <p>
@@ -36,6 +44,9 @@ public class TaOrgOrderController extends BaseController {
     @Autowired
     public ITaOrgOrderService iTaOrgOrderService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
 
     /**
      * 分页查询列表
@@ -47,12 +58,19 @@ public class TaOrgOrderController extends BaseController {
     public ResponseBean taOrgOrderList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam( value = "orderType", required = false) String orderType,
-                                       @RequestParam( value = "orgId", required = false) Integer orgId){
+                                       @RequestParam( value = "orgId", required = false) Integer orgId,
+                                       @RequestParam( value = "tradeNo", required = false) String tradeNo,
+                                       @RequestParam( value = "isOffline", required = false) Integer isOffline,
+                                       @RequestParam( value = "tradingStatus", required = false) String tradingStatus,
+                                       @RequestParam( value = "receivePhone", required = false) String receivePhone,
+                                       @RequestParam( value = "itemType", required = false) String itemType,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -146,4 +164,24 @@ public class TaOrgOrderController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 查询接收人信息
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/receiveInfo/{id}",method= RequestMethod.GET)
+    public ResponseBean receiveInfoGet(@PathVariable String id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("phone", id);
+            taPersonQueryWrapper.eq("org_id", getOrgId(request));
+            responseBean.addSuccess(iTaPersonService.getOne(taPersonQueryWrapper));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("receiveInfoGet -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.redpack.mapper;
 
+import java.time.LocalDate;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +26,14 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param orderType
      * @return
      */
-    IPage<TaOrgOrder> orderListByRechargeOrRefund(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
+    IPage<TaOrgOrder> orderListByRechargeOrRefund(IPage<TaOrgOrder> pg,
+                                                  @Param("orderType") String orderType,
+                                                  @Param("orgId") Integer orgId,
+                                                  @Param("tradeNo") String tradeNo,
+                                                  @Param("isOffline") Integer isOffline,
+                                                  @Param("tradingStatus") String tradingStatus,
+                                                  @Param("startDate") LocalDate startDate,
+                                                  @Param("endDate") LocalDate endDate);
 
     /**
      * 消费订单
@@ -33,5 +42,13 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param orgId
      * @return
      */
-    IPage<TaOrgOrder> orderListByConsume(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
+    IPage<TaOrgOrder> orderListByConsume(IPage<TaOrgOrder> pg,
+                                         @Param("orderType") String orderType,
+                                         @Param("orgId") Integer orgId,
+                                         @Param("tradeNo") String tradeNo,
+                                         @Param("tradingStatus") String tradingStatus,
+                                         @Param("receivePhone") String receivePhone,
+                                         @Param("itemType") String itemType,
+                                         @Param("startDate") LocalDate startDate,
+                                         @Param("endDate") LocalDate endDate);
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.redpack.service;
 
+import java.time.LocalDate;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
@@ -40,5 +42,5 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orderType
      * @return
      */
-    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId);
+    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -69,14 +70,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private TaUserMapper taUserMapper;
 
     @Override
-    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId) {
+    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate) {
         IPage<TaOrgOrder> result = null;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
-            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId);
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate);
             return result;
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)){
-            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId);
+            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate);
             return result;
         } else {
             return null;

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

@@ -4,7 +4,7 @@
 
     <select id="orderListByRechargeOrRefund" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
         select
-        t.order_id,
+        t.trade_no,
         t.amount,
         b.name as miniAppName,
         t.is_offline,
@@ -27,16 +27,31 @@
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
+        <if test="tradeNo != null and tradeNo != ''">
+            and t.trade_no = #{tradeNo}
+        </if>
+        <if test="isOffline != null and isOffline != ''">
+            and t.is_offline = #{isOffline}
+        </if>
+        <if test="tradingStatus != null and tradingStatus != ''">
+            and t.trading_status = #{tradingStatus}
+        </if>
+        <if test="startDate != null and startDate != ''">
+            and t.create_date > #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and t.create_date &lt; #{endDate}
+        </if>
         GROUP BY t.order_id
     </select>
 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
         select
-        t.order_id,
+        t.trade_no,
         b.name as miniAppName,
         t.amount,
         t.create_date,
-        ifnull(c.phone, c.tel) as phone,
+        c.phone,
         t.trading_status
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
@@ -47,6 +62,27 @@
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        <if test="tradeNo != null and tradeNo != ''">
+            and t.trade_no = #{tradeNo}
+        </if>
+        <if test="tradingStatus != null and tradingStatus != ''">
+            and t.trading_status = #{tradingStatus}
+        </if>
+        <if test="startDate != null and startDate != ''">
+            and t.create_date > #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and t.create_date &lt; #{endDate}
+        </if>
+        <if test="receivePhone != null and receivePhone != ''">
+            and c.receivePhone like concat('%', #{receivePhone}, '%')
+        </if>
+        <if test="itemType != null and itemType != ''">
+            and a.item_type = #{itemType}
+        </if>
         GROUP BY t.order_id
     </select>