From 4639cd1b8a3091afde0fbfa094cc3f36d5f9bb61 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 12 Nov 2018 13:32:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B7=E5=8D=A1=E6=94=AF=E4=BB=98=E6=B5=81?= =?UTF-8?q?=E6=B0=B4][=E5=88=B7=E5=8D=A1=E6=94=AF=E4=BB=98]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E6=88=B7+B=E7=94=A8=E6=88=B7+C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMicroPayController.java | 2 +- .../com/iformall/domain/vo/WxOrderPayVo.java | 124 ++++++++++++++++++ .../com/iformall/mapper/WxOrderMapper.java | 3 +- .../service/impl/WxOrderServiceImpl.java | 3 +- .../main/resources/mapper/WxOrderMapper.xml | 54 ++++++-- 5 files changed, 172 insertions(+), 14 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index fccd25ee9..cf24346f6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -219,7 +219,7 @@ public class WxMicroPayController extends BaseController { @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query",required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query",required = true)}) - public ResultData listUnverified(String date, Integer pageNum, Integer pageSize) { + public ResultData listMicroPay(String date, Integer pageNum, Integer pageSize) { return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java new file mode 100644 index 000000000..4a691b05f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java @@ -0,0 +1,124 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxOrder; + +import java.util.List; + +public class WxOrderPayVo extends WxOrder { + + /**发券商户信息*/ + /**商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") + private String merchantName; + /**b端用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") + private String bUserName; + /**b端用户手机号**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") + private String bUserPhone; + + /**c用户绑定的手机号**/ + @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") + private String cUserPhone; + + public String getMerchantName() { + return merchantName; + } + + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } + + public String getbUserName() { + return bUserName; + } + + public void setbUserName(String bUserName) { + this.bUserName = bUserName; + } + + public String getbUserPhone() { + return bUserPhone; + } + + public void setbUserPhone(String bUserPhone) { + this.bUserPhone = bUserPhone; + } + + public String getcUserPhone() { + return cUserPhone; + } + + public void setcUserPhone(String cUserPhone) { + this.cUserPhone = cUserPhone; + } + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,OrderNumber_ASC("`order_number` ASC"),OrderNumber_DESC("`order_number` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") + ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") + ,PaymentType_ASC("`payment_type` ASC"),PaymentType_DESC("`payment_type` DESC") + ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") + ,PaymentTime_ASC("`payment_time` ASC"),PaymentTime_DESC("`payment_time` DESC") + ,OrderStatus_ASC("`order_status` ASC"),OrderStatus_DESC("`order_status` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxOrder.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxOrder.Field.valueOf(sortColumns)); + } + } + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 106fde6c1..3e77d0462 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -4,6 +4,7 @@ import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.vo.WxOrderCVo; import com.iformall.domain.po.WxOrder; +import com.iformall.domain.vo.WxOrderPayVo; public interface WxOrderMapper extends CommonMapper { @@ -19,6 +20,6 @@ public interface WxOrderMapper extends CommonMapper { WxOrderCVo selectDetailOfCUser(WxOrder wxOrder); Map dayMicroPayAmountList(Map dateMap); - List findListOfMicroPayOrderByDate(Map dateMap); + List findListOfMicroPayOrderByDate(Map dateMap); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index fd0b1cf20..b8e7fe81b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxOrderCVo; +import com.iformall.domain.vo.WxOrderPayVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -134,7 +135,7 @@ public class WxOrderServiceImpl implements WxOrderService { Map resultMap = new HashMap(); if (pageIndex == null || pageSize == null) { - List list; + List list; list = wxOrderMapper.findListOfMicroPayOrderByDate(dateMap); logger.info("find " + list.size() + " order from " + startDate + " to " + new Date()); int total_price = 0; diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index ba53e8f5e..88df11981 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -239,7 +239,7 @@ - select - - from wx_order - where order_status = '1' and `type` = 1 + + from wx_order o + inner JOIN wx_merchant m on m.id = o.merchant_id + left join wx_merchant_b_user bu on bu.`merchant_id` = o.`merchant_id` and bu.id = o.`b_user_id` + left JOIN wx_c_user cu on cu.id = o.c_user_id + where o.order_status = '1' and o.`type` = 1 - and `tenant_id` = #{tenantId} + and o.`tenant_id` = #{tenantId} - and `merchant_id` = #{merchantId} + and o.`merchant_id` = #{merchantId} - and `b_user_id` = #{bUserId} + and o.`b_user_id` = #{bUserId} - AND create_date > #{startDate,jdbcType=TIMESTAMP} + AND o.create_date > #{startDate,jdbcType=TIMESTAMP} - AND create_date < #{endDate,jdbcType=TIMESTAMP} + AND o.create_date < #{endDate,jdbcType=TIMESTAMP} - order by create_date desc + order by o.create_date desc