zhiyuxing
/
estateagents
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 15 Wiki Activity
Browse Source

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

顾绍勇 4 years ago
parent
fcf78d64b5 74896794af
commit
4f9973ebff
6 changed files with 111 additions and 17 deletions
Split View Show Diff Stats
  1. 6
    6
      src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java
  2. 40
    2
      src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java
  3. 19
    2
      src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java
  4. 3
    1
      src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java
  5. 4
    3
      src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java
  6. 39
    3
      src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

+ 6
- 6
src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java View File 

@@ -34,7 +34,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
34 34 
  * @since 2020-06-03
35 35 
  */
36 36 
 @RestController
37 
-@RequestMapping("/channel")
37 
+@RequestMapping("/api")
38 38 
 public class TaOrgAccountController extends BaseController {
39 39
40 40 
     private final Logger logger = LoggerFactory.getLogger(TaOrgAccountController.class);

@@ -145,7 +145,7 @@ public class TaOrgAccountController extends BaseController {
145 145 
      * 根据id查询对象
146 146 
      * @param id  实体ID
147 147 
      */
148 
-    @RequestMapping(value="/api/taOrgAccount/{id}",method= RequestMethod.GET)
148 
+    @RequestMapping(value="/channel/taOrgAccount/{id}",method= RequestMethod.GET)
149 149 
     public ResponseBean taOrgAccountGet(@PathVariable Integer id){
150 150 
         ResponseBean responseBean = new ResponseBean();
151 151 
         try {

@@ -162,7 +162,7 @@ public class TaOrgAccountController extends BaseController {
162 162 
      * 系统账户充值
163 163 
      * @param id  实体ID
164 164 
      */
165 
-    @RequestMapping(value="/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
165 
+    @RequestMapping(value="/channel/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
166 166 
     public ResponseBean taOrgAccountRecharge(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
167 167 
                                                     HttpServletRequest request){
168 168 
         ResponseBean responseBean = new ResponseBean();

@@ -185,7 +185,7 @@ public class TaOrgAccountController extends BaseController {
185 185 
      * @param request
186 186 
      * @return
187 187 
      */
188 
-    @RequestMapping(value = "/taOrgAccount/refund/{id}")
188 
+    @RequestMapping(value = "/channel/taOrgAccount/refund/{id}",method= RequestMethod.PUT)
189 189 
     public ResponseBean taOrgAccountRefund(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
190 190 
                                            HttpServletRequest request){
191 191 
         ResponseBean responseBean = new ResponseBean();

@@ -208,7 +208,7 @@ public class TaOrgAccountController extends BaseController {
208 208 
      * @param request
209 209 
      * @return
210 210 
      */
211 
-    @RequestMapping(value = "/taOrgOrder/refund/{id}")
211 
+    @RequestMapping(value = "/channel/taOrgOrder/refund/{id}",method= RequestMethod.PUT)
212 212 
     public ResponseBean taOrgOrderRefund(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
213 213 
                                            HttpServletRequest request){
214 214 
         ResponseBean responseBean = new ResponseBean();

@@ -230,7 +230,7 @@ public class TaOrgAccountController extends BaseController {
230 230 
      * @param request
231 231 
      * @return
232 232 
      */
233 
-    @RequestMapping(value = "/taOrgOrder/reject/{id}")
233 
+    @RequestMapping(value = "/channel/taOrgOrder/reject/{id}")
234 234 
     public ResponseBean taOrgOrderReject(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
235 235 
                                          HttpServletRequest request){
236 236 
         ResponseBean responseBean = new ResponseBean();

+ 40
- 2
src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java View File 

@@ -1,8 +1,14 @@
1 1 
 package com.huiju.estateagents.redpack.controller;
2 2
3 
+import java.time.LocalDate;
4 
+import java.time.LocalDateTime;
5 
+
6 
+import javax.servlet.http.HttpServletRequest;
7 
+
3 8 
 import org.slf4j.Logger;
4 9 
 import org.slf4j.LoggerFactory;
5 10 
 import org.springframework.beans.factory.annotation.Autowired;
11 
+import org.springframework.format.annotation.DateTimeFormat;
6 12 
 import org.springframework.web.bind.annotation.PathVariable;
7 13 
 import org.springframework.web.bind.annotation.RequestBody;
8 14 
 import org.springframework.web.bind.annotation.RequestMapping;

@@ -16,8 +22,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
16 22 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
17 23 
 import com.huiju.estateagents.base.BaseController;
18 24 
 import com.huiju.estateagents.base.ResponseBean;
25 
+import com.huiju.estateagents.entity.TaPerson;
19 26 
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
20 27 
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
28 
+import com.huiju.estateagents.service.ITaPersonService;
21 29
22 30 
 /**
23 31 
  * <p>

@@ -36,6 +44,9 @@ public class TaOrgOrderController extends BaseController {
36 44 
     @Autowired
37 45 
     public ITaOrgOrderService iTaOrgOrderService;
38 46
47 
+    @Autowired
48 
+    public ITaPersonService iTaPersonService;
49 
+
39 50
40 51 
     /**
41 52 
      * 分页查询列表

@@ -47,12 +58,19 @@ public class TaOrgOrderController extends BaseController {
47 58 
     public ResponseBean taOrgOrderList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
48 59 
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
49 60 
                                        @RequestParam( value = "orderType", required = false) String orderType,
50 
-                                       @RequestParam( value = "orgId", required = false) Integer orgId){
61 
+                                       @RequestParam( value = "orgId", required = false) Integer orgId,
62 
+                                       @RequestParam( value = "tradeNo", required = false) String tradeNo,
63 
+                                       @RequestParam( value = "isOffline", required = false) Integer isOffline,
64 
+                                       @RequestParam( value = "tradingStatus", required = false) String tradingStatus,
65 
+                                       @RequestParam( value = "receivePhone", required = false) String receivePhone,
66 
+                                       @RequestParam( value = "itemType", required = false) String itemType,
67 
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
68 
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate){
51 69 
         ResponseBean responseBean = new ResponseBean();
52 70 
         try {
53 71 
             //使用分页插件
54 72 
 		    IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
55 
-            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId);
73 
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate);
56 74 
             responseBean.addSuccess(result);
57 75 
         }catch (Exception e){
58 76 
             e.printStackTrace();

@@ -146,4 +164,24 @@ public class TaOrgOrderController extends BaseController {
146 164 
         }
147 165 
         return responseBean;
148 166 
     }
167 
+
168 
+    /**
169 
+     * 查询接收人信息
170 
+     * @param id  实体ID
171 
+     */
172 
+    @RequestMapping(value="/channel/receiveInfo/{id}",method= RequestMethod.GET)
173 
+    public ResponseBean receiveInfoGet(@PathVariable String id, HttpServletRequest request){
174 
+        ResponseBean responseBean = new ResponseBean();
175 
+        try {
176 
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
177 
+            taPersonQueryWrapper.eq("phone", id);
178 
+            taPersonQueryWrapper.eq("org_id", getOrgId(request));
179 
+            responseBean.addSuccess(iTaPersonService.getOne(taPersonQueryWrapper));
180 
+        }catch (Exception e){
181 
+            e.printStackTrace();
182 
+            logger.error("receiveInfoGet -=- {}",e.toString());
183 
+            responseBean.addError(e.getMessage());
184 
+        }
185 
+        return responseBean;
186 
+    }
149 187 
 }

+ 19
- 2
src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java View File 

@@ -1,5 +1,7 @@
1 1 
 package com.huiju.estateagents.redpack.mapper;
2 2
3 
+import java.time.LocalDate;
4 
+
3 5 
 import org.apache.ibatis.annotations.Mapper;
4 6 
 import org.apache.ibatis.annotations.Param;
5 7 
 
@@ -24,7 +26,14 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
24 26 
      * @param orderType
25 27 
      * @return
26 28 
      */
27 
-    IPage<TaOrgOrder> orderListByRechargeOrRefund(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
29 
+    IPage<TaOrgOrder> orderListByRechargeOrRefund(IPage<TaOrgOrder> pg,
30 
+                                                  @Param("orderType") String orderType,
31 
+                                                  @Param("orgId") Integer orgId,
32 
+                                                  @Param("tradeNo") String tradeNo,
33 
+                                                  @Param("isOffline") Integer isOffline,
34 
+                                                  @Param("tradingStatus") String tradingStatus,
35 
+                                                  @Param("startDate") LocalDate startDate,
36 
+                                                  @Param("endDate") LocalDate endDate);
28 37
29 38 
     /**
30 39 
      * 消费订单
 
@@ -33,5 +42,13 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
33 42 
      * @param orgId
34 43 
      * @return
35 44 
      */
36 
-    IPage<TaOrgOrder> orderListByConsume(IPage<TaOrgOrder> pg, @Param("orderType") String orderType, @Param("orgId") Integer orgId);
45 
+    IPage<TaOrgOrder> orderListByConsume(IPage<TaOrgOrder> pg,
46 
+                                         @Param("orderType") String orderType,
47 
+                                         @Param("orgId") Integer orgId,
48 
+                                         @Param("tradeNo") String tradeNo,
49 
+                                         @Param("tradingStatus") String tradingStatus,
50 
+                                         @Param("receivePhone") String receivePhone,
51 
+                                         @Param("itemType") String itemType,
52 
+                                         @Param("startDate") LocalDate startDate,
53 
+                                         @Param("endDate") LocalDate endDate);
37 54 
 }

+ 3
- 1
src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java View File 

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

+ 4
- 3
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java View File 

@@ -1,5 +1,6 @@
1 1 
 package com.huiju.estateagents.redpack.service.impl;
2 2
3 
+import java.time.LocalDate;
3 4 
 import java.time.LocalDateTime;
4 5 
 import java.util.ArrayList;
5 6 
 import java.util.List;
 
@@ -69,14 +70,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
69 70 
     private TaUserMapper taUserMapper;
70 71
71 72 
     @Override
72 
-    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId) {
73 
+    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) {
73 74 
         IPage<TaOrgOrder> result = null;
74 75
75 76 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
76 
-            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId);
77 
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate);
77 78 
             return result;
78 79 
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)){
79 
-            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId);
80 
+            result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate);
80 81 
             return result;
81 82 
         } else {
82 83 
             return null;

+ 39
- 3
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml View File 

@@ -4,7 +4,7 @@
4 4
5 5 
     <select id="orderListByRechargeOrRefund" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
6 6 
         select
7 
-        t.order_id,
7 
+        t.trade_no,
8 8 
         t.amount,
9 9 
         b.name as miniAppName,
10 10 
         t.is_offline,
 
@@ -27,16 +27,31 @@
27 27 
         <if test="orgId != null and orgId != ''">
28 28 
             and t.org_id = #{orgId}
29 29 
         </if>
30 
+        <if test="tradeNo != null and tradeNo != ''">
31 
+            and t.trade_no = #{tradeNo}
32 
+        </if>
33 
+        <if test="isOffline != null and isOffline != ''">
34 
+            and t.is_offline = #{isOffline}
35 
+        </if>
36 
+        <if test="tradingStatus != null and tradingStatus != ''">
37 
+            and t.trading_status = #{tradingStatus}
38 
+        </if>
39 
+        <if test="startDate != null and startDate != ''">
40 
+            and t.create_date > #{startDate}
41 
+        </if>
42 
+        <if test="endDate != null and endDate != ''">
43 
+            and t.create_date &lt; #{endDate}
44 
+        </if>
30 45 
         GROUP BY t.order_id
31 46 
     </select>
32 47
33 48 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
34 49 
         select
35 
-        t.order_id,
50 
+        t.trade_no,
36 51 
         b.name as miniAppName,
37 52 
         t.amount,
38 53 
         t.create_date,
39 
-        ifnull(c.phone, c.tel) as phone,
54 
+        c.phone,
40 55 
         t.trading_status
41 56 
         From ta_org_order t
42 57 
         left join ta_org_order_detail a on t.order_id = a.order_id
 
@@ -47,6 +62,27 @@
47 62 
         <if test="orgId != null and orgId != ''">
48 63 
             and t.org_id = #{orgId}
49 64 
         </if>
65 
+        <if test="orgId != null and orgId != ''">
66 
+            and t.org_id = #{orgId}
67 
+        </if>
68 
+        <if test="tradeNo != null and tradeNo != ''">
69 
+            and t.trade_no = #{tradeNo}
70 
+        </if>
71 
+        <if test="tradingStatus != null and tradingStatus != ''">
72 
+            and t.trading_status = #{tradingStatus}
73 
+        </if>
74 
+        <if test="startDate != null and startDate != ''">
75 
+            and t.create_date > #{startDate}
76 
+        </if>
77 
+        <if test="endDate != null and endDate != ''">
78 
+            and t.create_date &lt; #{endDate}
79 
+        </if>
80 
+        <if test="receivePhone != null and receivePhone != ''">
81 
+            and c.receivePhone like concat('%', #{receivePhone}, '%')
82 
+        </if>
83 
+        <if test="itemType != null and itemType != ''">
84 
+            and a.item_type = #{itemType}
85 
+        </if>
50 86 
         GROUP BY t.order_id
51 87 
     </select>
52 88