hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

Browse Source
dev-discount
袁野 3 years ago
parent a7a5029b8e 5e8a27ef34
commit 1964cd4e16
2 changed files with 10 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
  2. 2
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

8
hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
Unescape View File

@ -424,6 +424,8 @@ public class HighOrderController {
@RequestParam(name = "identificationCode", required = true) String identificationCode,
@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "paySerialNo", required = false) String paySerialNo,
@RequestParam(name = "memPhone", required = false) String memPhone,
@RequestParam(name = "memDiscountName", required = false) String memDiscountName,
@RequestParam(name = "payModel", required = false) Integer payModel,
@RequestParam(name = "payType", required = false) Integer payType,
@RequestParam(name = "orderStatus", required = false) Integer orderStatus,
@ -443,6 +445,8 @@ public class HighOrderController {
map.put("identificationCode", identificationCode);
map.put("orderNo", orderNo);
map.put("paySerialNo", paySerialNo);
map.put("memPhone", memPhone);
map.put("memDiscountName", memDiscountName);
map.put("payModel", payModel);
map.put("payType", payType);
map.put("orderStatus", orderStatus);
@ -467,6 +471,8 @@ public class HighOrderController {
@RequestParam(name = "merchantId", required = false) Long merchantId,
@RequestParam(name = "identificationCode", required = true) String identificationCode,
@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "memPhone", required = false) String memPhone,
@RequestParam(name = "memDiscountName", required = false) String memDiscountName,
@RequestParam(name = "paySerialNo", required = false) String paySerialNo,
@RequestParam(name = "payModel", required = false) Integer payModel,
@RequestParam(name = "payType", required = false) Integer payType,
@ -482,6 +488,8 @@ public class HighOrderController {
Map<String,Object> map = new HashMap<>();
map.put("orderNo", orderNo);
map.put("paySerialNo", paySerialNo);
map.put("memPhone", memPhone);
map.put("memDiscountName", memDiscountName);
map.put("payModel", payModel);
map.put("payType", payType);
map.put("orderStatus", orderStatus);

2
hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
Unescape View File

@ -389,6 +389,8 @@ public interface HighOrderMapperExt {
" <if test='map.orderNo != null'> and b.order_no = #{map.orderNo} </if>" +
" <if test='map.paySerialNo != null'> and b.pay_serial_no = #{map.paySerialNo} </if>" +
" <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>" +
" <if test='map.memDiscountName != null'> and a.goods_name = #{map.memDiscountName} </if>" +
" <if test='map.memPhone != null'> and b.mem_phone = #{map.memPhone} </if>" +
" <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>" +
" <if test='map.memPhone != null'> and b.mem_phone = #{map.memPhone} </if> " +
" <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>" +

Write Preview
Loading…
Cancel
Save