From 8436089555089ff874f869eb0f326d30a4a15068 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 6 Jul 2023 14:16:19 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E5=95=86=E5=9C=88=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AliBusinessCircleOrderController.java | 19 +++++++++++ .../WxBusinessCircleOrderController.java | 19 +++++++++++ .../domain/po/BusinessCircleBase.java | 3 ++ .../domain/vo/AlipayOrWxStatistics.java | 15 +++++++++ .../mapper/AliBusinessCircleOrderMapper.java | 3 ++ .../mapper/WxBusinessCircleOrderMapper.java | 6 ++-- .../AliBusinessCircleOrderService.java | 3 ++ .../service/WxBusinessCircleOrderService.java | 3 ++ .../iformall/service/WxMerchantService.java | 3 ++ .../AliBusinessCircleOrderServiceImpl.java | 30 +++++++++++++++++ .../WxBusinessCircleOrderServiceImpl.java | 32 +++++++++++++++++++ .../service/impl/WxMerchantServiceImpl.java | 7 ++++ .../mapper/AliBusinessCircleOrderMapper.xml | 15 +++++++++ .../mapper/WxBusinessCircleOrderMapper.xml | 16 +++++++++- 14 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index cf9b22e36..8152a0a24 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.service.AliBusinessCircleOrderService; import com.iformall.utils.Constant; import io.swagger.annotations.Api; @@ -109,5 +110,23 @@ public class AliBusinessCircleOrderController extends BaseController { aliBusinessCircleOrderService.exportData(circleOrder, request, response); } + @ApiOperation("阿里记录分页列表接口") + @GetMapping("aliPayList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "-列表") + public ResultData aliPayList(@ModelAttribute AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::aliPayList"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } +// circleOrder.updateTenantInfo(getTenantInfo()); + circleOrder.setTenantId("789"); + circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + final PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 6e2f38578..28a58b8b5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.service.*; import com.iformall.utils.Constant; import io.swagger.annotations.Api; @@ -105,5 +106,23 @@ public class WxBusinessCircleOrderController extends BaseController { wxBusinessCircleOrderService.exportData(circleOrder, request, response); } + @ApiOperation("微信数据分页列表接口") + @GetMapping("wxPayList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "-列表") + public ResultData wxPayList(@ModelAttribute WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::wxPayList"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } +// circleOrder.updateTenantInfo(getTenantInfo()); + circleOrder.setTenantId("789"); + circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + final PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java index a0f3efece..3e7450fc3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java @@ -10,6 +10,7 @@ import lombok.ToString; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @Data @ToString(callSuper = true) @@ -138,4 +139,6 @@ public class BusinessCircleBase extends TenantEntity { return refundAmount != null ? new BigDecimal(refundAmount).divide(new BigDecimal(100)).toPlainString(): refundAmountStr; } + private List merchantIds; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java new file mode 100644 index 000000000..0efbd3e58 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -0,0 +1,15 @@ +package com.iformall.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; + +@Data +public class AlipayOrWxStatistics { + @TableField(exist = false) + private String merchantName;//商户名称 + private Integer payAmount;//支付总金额 + private Integer refundAmount;//退款总金额 + private Integer increasedPoints;//积分情况 + private Long merchantId; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index c28c1064a..5aa2c9c34 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -4,6 +4,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; +import com.iformall.domain.vo.AlipayOrWxStatistics; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -47,4 +48,6 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper aliPayList(AliBusinessCircleOrder record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index c35fa6d54..1830a7657 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -3,9 +3,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; -import org.apache.ibatis.annotations.Param; +import com.iformall.domain.vo.AlipayOrWxStatistics; -import java.util.Date; import java.util.List; public interface WxBusinessCircleOrderMapper extends CommonMapper { @@ -50,4 +49,7 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxPayList(WxBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index b52fcce4e..cd2ebe841 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.AlipayOrWxStatistics; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,4 +58,6 @@ public interface AliBusinessCircleOrderService { Integer sumCirclePayment(BusinessCircleBase circleOrder); Integer sumCircleRefundAmount(BusinessCircleBase circleOrder); + + PageInfo aliPayList(AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index cec38d631..19a7dfd13 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.AlipayOrWxStatistics; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -89,4 +90,6 @@ public interface WxBusinessCircleOrderService { void sendSyncParkingsMsg(TenantEntity tenantEntity,Long carCmdLogId); + PageInfo wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index a9b373160..f386c69b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.WxMerchantCorp; import com.iformall.domain.po.WxPark; import com.iformall.domain.po.base.TenantEntity; @@ -12,6 +13,7 @@ import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.ModelAttribute; import javax.servlet.http.HttpServletRequest; @@ -220,4 +222,5 @@ public interface WxMerchantService { PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + List selectByMerchantIds(String merchantName); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 814583182..5e6ed6215 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -7,12 +7,14 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.AliBusinessCircleOrderMapper; import com.iformall.service.*; import com.iformall.utils.Constant; import com.iformall.utils.RedisLock; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +27,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrderService { @@ -379,4 +383,30 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder return sumCircleRefundAmount==null?0:sumCircleRefundAmount; } + @Override + public PageInfo aliPayList(AliBusinessCircleOrder record, Integer pageIndex, Integer pageSize) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + } + } + + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> aliBusinessCircleOrderMapper.aliPayList(record)); + if (CollectionUtils.isEmpty(pageInfo.getList())) { + return pageInfo; + } + List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + List wxMerchants = wxMerchantService.findList(wxMerchant); + if (CollectionUtils.isEmpty(wxMerchants)) { + return pageInfo; + } + Map map = wxMerchants.parallelStream().collect(Collectors.toMap(WxMerchant::getId, WxMerchant::getName)); + pageInfo.getList().forEach(x -> { + x.setMerchantName(map.get(x.getMerchantId())); + }); + return pageInfo; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index ae280edf3..414e1953f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AfterBusinessCreditMsg; +import com.iformall.domain.vo.AlipayOrWxStatistics; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBusinessCircleOrderMapper; @@ -23,6 +24,7 @@ import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import com.iformall.utils.MaUtil; import com.iformall.utils.RedisLock; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +38,9 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Service public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderService { @@ -553,5 +558,32 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe // mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } + @Override + public PageInfo wxPayList(WxBusinessCircleOrder record, Integer pageIndex, Integer pageSize) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + } + } + + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBusinessCircleOrderMapper.wxPayList(record)); + if (CollectionUtils.isEmpty(pageInfo.getList())) { + return pageInfo; + } + List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + List wxMerchants = wxMerchantService.findList(wxMerchant); + if (CollectionUtils.isEmpty(wxMerchants)) { + return pageInfo; + } + Map map = wxMerchants.parallelStream().collect(Collectors.toMap(WxMerchant::getId, WxMerchant::getName)); + pageInfo.getList().forEach(x -> { + x.setMerchantName(map.get(x.getMerchantId())); + }); + return pageInfo; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 89a790891..2cba95896 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2132,4 +2132,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(wxMerchant)); return pageInfo; } + + @Override + public List selectByMerchantIds(String merchantName) { + WxMerchant merchant = new WxMerchant(); + merchant.setName(merchantName); + return wxMerchantMapper.findIdList(merchant); + } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 1e0fcf8a4..3730f5da7 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -229,4 +229,19 @@ and is_refund = 1 + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 3fe1cc89d..1da93e040 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -261,4 +261,18 @@ and is_refund = 1 - + + \ No newline at end of file From 251b6eeef7f4ea7319630af53bbd51794e35e818 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 6 Jul 2023 16:28:22 +0800 Subject: [PATCH 02/26] fix car bug --- .../src/main/java/com/iformall/enums/EnumCarVendor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java index 5ff704b42..649e612d6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarVendor.java @@ -17,8 +17,8 @@ public enum EnumCarVendor { CAR_JIESHUN_V2(10,"JIESHUNV2",true),//捷顺通用版本 CAR_HAIKANGWEISHI(8,"HAIKANGWEISHI",true), CAR_FUTE(9,"FUTE",false),//深圳市福特智能科技有限公司 - CAR_LIFANG(10,"LIFANG",false),//立方停车【接口不支持未接通,不能使用】 - CAR_KETUO(11,"KETUO",false)//科拓停车 + CAR_KETUO(11,"KETUO",false),//科拓停车 + CAR_LIFANG(12,"LIFANG",false)//立方停车【接口不支持未接通,不能使用】 ; public static EnumCarVendor getEnum(Integer code) { From 4052556bc9a44cafe16efcee1e10915fd95cf36d Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 7 Jul 2023 20:38:44 +0800 Subject: [PATCH 03/26] fix car bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 0247b49b4..ab110a587 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -57,7 +57,7 @@ public class KeTuoUtil { JSONObject param = new JSONObject(); param.put("plateNo", carNumber);//车牌号 log.info("ketuo getCarStopFee :" + JSON.toJSONString(param)); - return Proc(QUERY_FEE,"getParkingPaymentInfo", vp.getString("appId"), vp.getString("appSercet"), Integer.parseInt(wxPark.getParkingId()),vp.getString("version"),param); + return Proc(vp.getString("uri")+QUERY_FEE,"getParkingPaymentInfo", vp.getString("appId"), vp.getString("appSercet"), Integer.parseInt(wxPark.getParkingId()),vp.getString("version"),param); } /** @@ -94,7 +94,7 @@ public class KeTuoUtil { freeDetails.add(freeDeail); param.put("freeDetail", JSON.toJSONString(freeDetails));//json数组字符串 log.info("ketuo executediscount :" + JSON.toJSONString(param)); - return Proc(PAY_FEE,"payParkingFee", vp.getString("appId"), vp.getString("appSercet"), Integer.parseInt(wxPark.getParkingId()),vp.getString("version"),param); + return Proc(vp.getString("uri")+PAY_FEE,"payParkingFee", vp.getString("appId"), vp.getString("appSercet"), Integer.parseInt(wxPark.getParkingId()),vp.getString("version"),param); } private static String Proc(String url, String serviceCode,String appId,String appSercet,Integer parkId,String version, JSONObject params) { From b22960b22cb6a1107b2176eee203da0f60ba94a6 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 11:53:00 +0800 Subject: [PATCH 04/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index ab110a587..8fae83ee7 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -110,10 +110,10 @@ public class KeTuoUtil { params.put("appId", appId); params.put("parkId", parkId); params.put("serviceCode", serviceCode); - params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); + params.put("ts", Calendar.getInstance().getTimeInMillis()); params.put("key", paramsSign(params, appSercet)); params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); - httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params),ContentType.create("application/json","utf-8"))); + httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params))); } catch (Exception e) { log.error(e.getLocalizedMessage(),e); return null; @@ -169,6 +169,7 @@ public class KeTuoUtil { }); //拼接appSecret String temp = Joiner.on("&").withKeyValueSeparator("=").join(params).concat("&").concat(appSecret); + System.out.println(temp); return md5(temp).toUpperCase(); } From db7f1170c2c2cf24c89ff023cadb8bc8a810acc8 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 12:10:01 +0800 Subject: [PATCH 05/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 8fae83ee7..9a0b8e4f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -110,7 +110,7 @@ public class KeTuoUtil { params.put("appId", appId); params.put("parkId", parkId); params.put("serviceCode", serviceCode); - params.put("ts", Calendar.getInstance().getTimeInMillis()); + params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); params.put("key", paramsSign(params, appSercet)); params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params))); From fb09d2eea83f690db7b5bd3868b865b2a9579ee0 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 12:27:27 +0800 Subject: [PATCH 06/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 9a0b8e4f5..1ff8938f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -169,7 +169,7 @@ public class KeTuoUtil { }); //拼接appSecret String temp = Joiner.on("&").withKeyValueSeparator("=").join(params).concat("&").concat(appSecret); - System.out.println(temp); + log.info(">>> signUrl="+temp); return md5(temp).toUpperCase(); } From 1e61136c9177786749e353f692eea3402fa62f63 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 12:35:15 +0800 Subject: [PATCH 07/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 1ff8938f0..9a54d44e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -111,8 +111,8 @@ public class KeTuoUtil { params.put("parkId", parkId); params.put("serviceCode", serviceCode); params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); - params.put("key", paramsSign(params, appSercet)); params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); + params.put("key", paramsSign(params, appSercet)); httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params))); } catch (Exception e) { log.error(e.getLocalizedMessage(),e); From 6dde6bb404e4d0ec1ff1ba8a9e2bafbc8c8cb7ed Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 12:46:07 +0800 Subject: [PATCH 08/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 9a54d44e6..9859a2933 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -111,9 +111,10 @@ public class KeTuoUtil { params.put("parkId", parkId); params.put("serviceCode", serviceCode); params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); - params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); + //params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); + params.put("reqId", Utility.generate32UUID()); params.put("key", paramsSign(params, appSercet)); - httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params))); + httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params),ContentType.create("application/json","utf-8"))); } catch (Exception e) { log.error(e.getLocalizedMessage(),e); return null; From 9f4f15504f1f3605137dfec60e6afb6a5b774de4 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 13:34:01 +0800 Subject: [PATCH 09/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 9859a2933..1e70c8885 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -111,8 +111,8 @@ public class KeTuoUtil { params.put("parkId", parkId); params.put("serviceCode", serviceCode); params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); - //params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); - params.put("reqId", Utility.generate32UUID()); + params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); + //params.put("reqId", Utility.generate32UUID()); params.put("key", paramsSign(params, appSercet)); httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params),ContentType.create("application/json","utf-8"))); } catch (Exception e) { From ff2a3bc9efde96fe1e23e0a96135b88eb479ea56 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 13:41:19 +0800 Subject: [PATCH 10/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 1e70c8885..4725e0262 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -112,7 +112,6 @@ public class KeTuoUtil { params.put("serviceCode", serviceCode); params.put("ts", String.valueOf(Calendar.getInstance().getTimeInMillis())); params.put("reqId", Utility.generate32UUID()+String.valueOf(Calendar.getInstance().getTimeInMillis())); - //params.put("reqId", Utility.generate32UUID()); params.put("key", paramsSign(params, appSercet)); httpPost.setEntity(new StringEntity(JSONObject.toJSONString(params),ContentType.create("application/json","utf-8"))); } catch (Exception e) { From b8c9c6fe496145d66c09d16b4051a19b6da82602 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 13:49:35 +0800 Subject: [PATCH 11/26] //..merchant --- .../db/migration/V2023070600001_circle_permission.sql | 9 +++++++++ .../src/main/java/com/iformall/enums/EnumCarCmd.java | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql new file mode 100644 index 000000000..755095674 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql @@ -0,0 +1,9 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (423, '商圈交易统计', 416, 'Y', NULL, 1, NULL, NULL, 'circleSum', NULL, 0, 421); + + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 409, 410, 411, 416, 418, 420, 421, 423, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 5502, 6610, 6611, 60701, 60702, 61201]' WHERE `id` = 2; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 223, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 225, 223, 224, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java index bb2b9409c..572abe88a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java @@ -69,6 +69,9 @@ public enum EnumCarCmd { list.add(CAR_CYF_CALLBACK_PARK_IN.getCode()); list.add(CAR_JIESHUN_CALLBACK_PARK_IN.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_IN.getCode()); + list.add(CAR_FUTE_CALLBACK_PARK_IN.getCode()); + list.add(CAR_LIFANG_CALLBACK_PARK_IN.getCode()); + list.add(CAR_KETUO_CALLBACK_PARK_IN.getCode()); return list; } @@ -80,6 +83,9 @@ public enum EnumCarCmd { list.add(CAR_CYF_CALLBACK_PARK_OUT.getCode()); list.add(CAR_JIESHUN_CALLBACK_PARK_OUT.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_FUTE_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_LIFANG_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_KETUO_CALLBACK_PARK_OUT.getCode()); return list; } @@ -91,6 +97,9 @@ public enum EnumCarCmd { list.add(CAR_CYF_CALLBACK_PAID.getCode()); list.add(CAR_JIESHUN_CALLBACK_PAID.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PAID.getCode()); + list.add(CAR_FUTE_CALLBACK_PAID.getCode()); + list.add(CAR_LIFANG_CALLBACK_PAID.getCode()); + list.add(CAR_KETUO_CALLBACK_PAID.getCode()); return list; } From 94a129fde06269c7ab5bc0c6d6e3e099907cab2b Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 14:18:43 +0800 Subject: [PATCH 12/26] //..merchant --- .../controller/market/AliBusinessCircleOrderController.java | 4 +--- .../controller/market/WxBusinessCircleOrderController.java | 4 +--- .../service/impl/AliBusinessCircleOrderServiceImpl.java | 3 +++ .../service/impl/WxBusinessCircleOrderServiceImpl.java | 3 +++ .../main/resources/mapper/AliBusinessCircleOrderMapper.xml | 5 +++-- .../main/resources/mapper/WxBusinessCircleOrderMapper.xml | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 8152a0a24..738268f1d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -122,9 +122,7 @@ public class AliBusinessCircleOrderController extends BaseController { if (null == circleOrder) { circleOrder = new AliBusinessCircleOrder(); } -// circleOrder.updateTenantInfo(getTenantInfo()); - circleOrder.setTenantId("789"); - circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + circleOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 28a58b8b5..e2fa3a37d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -118,9 +118,7 @@ public class WxBusinessCircleOrderController extends BaseController { if (null == circleOrder) { circleOrder = new WxBusinessCircleOrder(); } -// circleOrder.updateTenantInfo(getTenantInfo()); - circleOrder.setTenantId("789"); - circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + circleOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 5e6ed6215..9a06d106d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -389,6 +389,9 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 414e1953f..67ea2bc5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -564,6 +564,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 3730f5da7..7f5d0d2e6 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -229,7 +229,7 @@ and is_refund = 1 - SELECT SUM(pay_amount) as 'payAmount', SUM(refund_amount) as 'refundAmount', merchant_id as 'merchantId', @@ -241,7 +241,8 @@ #{id} - GROUP BY merchant_id,is_refund; + GROUP BY merchant_id,is_refund + order by payAmount desc; diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 1da93e040..d17f8e0fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -261,7 +261,7 @@ and is_refund = 1 - SELECT SUM(pay_amount) as 'payAmount', SUM(refund_amount) as 'refundAmount', merchant_id as 'merchantId', @@ -273,6 +273,7 @@ #{id} - GROUP BY merchant_id,is_refund; + GROUP BY merchant_id,is_refund + order by payAmount desc; \ No newline at end of file From cf1d6de7e5929e7dc9ed6606c9b09978c1197048 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 10 Jul 2023 14:21:18 +0800 Subject: [PATCH 13/26] fix bug --- .../src/main/java/com/iformall/config/ShiroConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index f787a458c..751a042c9 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -124,6 +124,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/hkwsCarCallback/**", "anon"); filterChainDefinitionMap.put("/futeCarCallback/**", "anon"); filterChainDefinitionMap.put("/carPaidCallback/**", "anon"); + filterChainDefinitionMap.put("/keTuoCarCallback/**", "anon"); // static files filterChainDefinitionMap.put("/css/**", "anon"); From f1099b7ff85a64a0ab913cbfb1d497abfd129166 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 16:25:12 +0800 Subject: [PATCH 14/26] //..circle --- .../domain/vo/AlipayOrWxStatistics.java | 3 +- .../mapper/AliBusinessCircleOrderMapper.java | 3 ++ .../mapper/WxBusinessCircleOrderMapper.java | 2 + .../AliBusinessCircleOrderServiceImpl.java | 26 ++++++++---- .../WxBusinessCircleOrderServiceImpl.java | 26 ++++++++---- .../mapper/AliBusinessCircleOrderMapper.xml | 39 +++++++++++++++--- .../mapper/WxBusinessCircleOrderMapper.xml | 40 ++++++++++++++++--- 7 files changed, 112 insertions(+), 27 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index 0efbd3e58..3bc5ffc1c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -10,6 +10,7 @@ public class AlipayOrWxStatistics { private String merchantName;//商户名称 private Integer payAmount;//支付总金额 private Integer refundAmount;//退款总金额 - private Integer increasedPoints;//积分情况 + private Integer payPoints;//支付总积分 + private Integer refundPoints;//支付总积分 private Long merchantId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index 5aa2c9c34..fda372577 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -50,4 +50,7 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper aliPayList(AliBusinessCircleOrder record); + + List aliRefundList(AliBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index 1830a7657..4cc42da7f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -52,4 +52,6 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxPayList(WxBusinessCircleOrder record); + List wxRefundList(WxBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 9a06d106d..0bf5e3b60 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -400,16 +400,28 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder return pageInfo; } List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + record.setMerchantIds(list); + //查询退款数据 + List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + Map statisticsMap = null; + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } + WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setIds(list); - List wxMerchants = wxMerchantService.findList(wxMerchant); - if (CollectionUtils.isEmpty(wxMerchants)) { - return pageInfo; + Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + + for (AlipayOrWxStatistics statistics:pageInfo.getList()) { + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(statisticsMap != null){ + AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); + if(refundstatistics != null){ + statistics.setRefundAmount(refundstatistics.getRefundAmount()); + statistics.setRefundPoints(refundstatistics.getRefundPoints()); + } + } } - Map map = wxMerchants.parallelStream().collect(Collectors.toMap(WxMerchant::getId, WxMerchant::getName)); - pageInfo.getList().forEach(x -> { - x.setMerchantName(map.get(x.getMerchantId())); - }); return pageInfo; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 67ea2bc5b..6c3e4e6f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -575,16 +575,28 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe return pageInfo; } List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + record.setMerchantIds(list); + //查询退款数据 + List alipayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + Map statisticsMap = null; + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } + WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setIds(list); - List wxMerchants = wxMerchantService.findList(wxMerchant); - if (CollectionUtils.isEmpty(wxMerchants)) { - return pageInfo; + Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + + for (AlipayOrWxStatistics statistics:pageInfo.getList()) { + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(statisticsMap != null){ + AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); + if(refundstatistics != null){ + statistics.setRefundAmount(refundstatistics.getRefundAmount()); + statistics.setRefundPoints(refundstatistics.getRefundPoints()); + } + } } - Map map = wxMerchants.parallelStream().collect(Collectors.toMap(WxMerchant::getId, WxMerchant::getName)); - pageInfo.getList().forEach(x -> { - x.setMerchantName(map.get(x.getMerchantId())); - }); return pageInfo; } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 7f5d0d2e6..45cc3382f 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -230,19 +230,46 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index d17f8e0fa..e145f7460 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -262,18 +262,46 @@ + + + \ No newline at end of file From 653a93a14d053e423d158f5d6e04afbab845cfaa Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 17:04:39 +0800 Subject: [PATCH 15/26] //..circle --- .../AliBusinessCircleOrderController.java | 15 +++++++ .../WxBusinessCircleOrderController.java | 15 +++++++ .../mapper/AliBusinessCircleOrderMapper.java | 4 ++ .../mapper/WxBusinessCircleOrderMapper.java | 5 +++ .../AliBusinessCircleOrderService.java | 2 + .../service/WxBusinessCircleOrderService.java | 3 ++ .../AliBusinessCircleOrderServiceImpl.java | 21 ++++++++++ .../WxBusinessCircleOrderServiceImpl.java | 21 ++++++++++ .../mapper/AliBusinessCircleOrderMapper.xml | 41 ++++++++++++++++++ .../mapper/WxBusinessCircleOrderMapper.xml | 42 ++++++++++++++++++- 10 files changed, 168 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 738268f1d..c2b6919f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -127,4 +127,19 @@ public class AliBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口2") + @GetMapping("aliStatistics") + @ApiImplicitParams({ + }) + @SystemControllerLog(description = "-统计") + public ResultData aliStatistics(@ModelAttribute AliBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::aliStatistics"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderService.aliStatistics(circleOrder); + return new ResultData(aliStatistics); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index e2fa3a37d..621211e5d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -123,4 +123,19 @@ public class WxBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口2") + @GetMapping("wxStatistics") + @ApiImplicitParams({ + }) + @SystemControllerLog(description = "-统计") + public ResultData wxStatistics(@ModelAttribute WxBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::wxPayList"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.aliStatistics(circleOrder); + return new ResultData(aliStatistics); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index fda372577..b2df06155 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -53,4 +53,8 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper aliRefundList(AliBusinessCircleOrder record); + AlipayOrWxStatistics aliPayStatistics(AliBusinessCircleOrder record); + + AlipayOrWxStatistics aliRefundStatistics(AliBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index 4cc42da7f..0d9790380 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.vo.AlipayOrWxStatistics; @@ -54,4 +55,8 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxRefundList(WxBusinessCircleOrder record); + AlipayOrWxStatistics aliPayStatistics(WxBusinessCircleOrder record); + + AlipayOrWxStatistics aliRefundStatistics(WxBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index cd2ebe841..22a99ec34 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -60,4 +60,6 @@ public interface AliBusinessCircleOrderService { Integer sumCircleRefundAmount(BusinessCircleBase circleOrder); PageInfo aliPayList(AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); + + AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 19a7dfd13..7dd637efd 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; @@ -92,4 +93,6 @@ public interface WxBusinessCircleOrderService { PageInfo wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); + AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder circleOrder); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 0bf5e3b60..32cb908cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -424,4 +424,25 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } return pageInfo; } + + @Override + public AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder record) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderMapper.aliPayStatistics(record); + if(aliStatistics.getPayAmount() > 0){ + AlipayOrWxStatistics aliRefundStatistics = aliBusinessCircleOrderMapper.aliRefundStatistics(record); + aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); + aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); + } + + return aliStatistics; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 6c3e4e6f1..78c32f2e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -600,5 +600,26 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe return pageInfo; } + @Override + public AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder record) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.aliPayStatistics(record); + if(aliStatistics.getPayAmount() > 0){ + AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.aliRefundStatistics(record); + aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); + aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); + } + + return aliStatistics; + } + } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 45cc3382f..59d8a08a4 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -272,4 +272,45 @@ GROUP BY merchant_id + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index e145f7460..979714afc 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -283,7 +283,7 @@ order by payAmount desc; - SELECT merchant_id as 'merchantId', IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' @@ -304,4 +304,44 @@ GROUP BY merchant_id + + + + \ No newline at end of file From 60d7c6f9f9ab290e7fdc0142b59ce8d92b4d0b97 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 17:19:26 +0800 Subject: [PATCH 16/26] //..circle --- .../com/iformall/domain/vo/AlipayOrWxStatistics.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index 3bc5ffc1c..0687b5ae2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -1,12 +1,14 @@ package com.iformall.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.iformall.domain.po.base.BaseEntity; import lombok.Data; +import java.io.Serializable; + @Data -public class AlipayOrWxStatistics { - @TableField(exist = false) +public class AlipayOrWxStatistics implements Serializable { + + private static final long serialVersionUID = 1L; + private String merchantName;//商户名称 private Integer payAmount;//支付总金额 private Integer refundAmount;//退款总金额 From 6d8e7fb6f9c428d13eaaafd406e3a1299619a46d Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 17:31:44 +0800 Subject: [PATCH 17/26] //..circle --- .../src/main/resources/mapper/WxBusinessCircleOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 979714afc..12b112d32 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -266,7 +266,7 @@ IFNULL(SUM(`pay_amount`),0) as 'payAmount', IFNULL(SUM(`increased_points`),0) as 'payPoints' FROM wx_business_circle_order - where is_refund = 0 + where is_refund = 0 and merchant_id is not null and `tenant_id` = #{tenantId} From f3550308af8aef8cf0cfbcf325cbfd99be661107 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 19:03:29 +0800 Subject: [PATCH 18/26] //..circle --- .../WxBusinessCircleOrderController.java | 6 +-- .../mapper/WxBusinessCircleOrderMapper.java | 4 +- .../service/WxBusinessCircleOrderService.java | 2 +- .../AliBusinessCircleOrderServiceImpl.java | 33 ++++++++++------ .../WxBusinessCircleOrderServiceImpl.java | 39 ++++++++++++------- .../mapper/AliBusinessCircleOrderMapper.xml | 2 +- .../mapper/WxBusinessCircleOrderMapper.xml | 14 +++---- 7 files changed, 61 insertions(+), 39 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 621211e5d..071c53126 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -48,7 +48,7 @@ public class WxBusinessCircleOrderController extends BaseController { } circleOrder.updateTenantInfo(getTenantInfo()); circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); - final PageInfo page = wxBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); + PageInfo page = wxBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -119,7 +119,7 @@ public class WxBusinessCircleOrderController extends BaseController { circleOrder = new WxBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); + PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -134,7 +134,7 @@ public class WxBusinessCircleOrderController extends BaseController { circleOrder = new WxBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.aliStatistics(circleOrder); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.wxStatistics(circleOrder); return new ResultData(aliStatistics); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index 0d9790380..67044b186 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -55,8 +55,8 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxRefundList(WxBusinessCircleOrder record); - AlipayOrWxStatistics aliPayStatistics(WxBusinessCircleOrder record); + AlipayOrWxStatistics wxPayStatistics(WxBusinessCircleOrder record); - AlipayOrWxStatistics aliRefundStatistics(WxBusinessCircleOrder record); + AlipayOrWxStatistics wxRefundStatistics(WxBusinessCircleOrder record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 7dd637efd..86307a6fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -93,6 +93,6 @@ public interface WxBusinessCircleOrderService { PageInfo wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); - AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder circleOrder); + AlipayOrWxStatistics wxStatistics(WxBusinessCircleOrder circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 32cb908cc..a8a09ced6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -399,21 +399,32 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder if (CollectionUtils.isEmpty(pageInfo.getList())) { return pageInfo; } - List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); - record.setMerchantIds(list); - //查询退款数据 - List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + List list = pageInfo.getList().parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + Map statisticsMap = null; - if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { - statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); - } + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setIds(list); - Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } for (AlipayOrWxStatistics statistics:pageInfo.getList()) { - statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("其他"); + } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); if(refundstatistics != null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 78c32f2e8..7e1a89358 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -574,21 +574,32 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe if (CollectionUtils.isEmpty(pageInfo.getList())) { return pageInfo; } - List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); - record.setMerchantIds(list); - //查询退款数据 - List alipayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + List list = pageInfo.getList().parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + Map statisticsMap = null; - if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { - statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); - } + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List alipayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setIds(list); - Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } for (AlipayOrWxStatistics statistics:pageInfo.getList()) { - statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("其他"); + } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); if(refundstatistics != null){ @@ -601,7 +612,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } @Override - public AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder record) { + public AlipayOrWxStatistics wxStatistics(WxBusinessCircleOrder record) { if (StringUtils.isNotEmpty(record.getMerchantName())) { List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { @@ -611,9 +622,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe record.setMerchantIds(ids); } } - AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.aliPayStatistics(record); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.wxPayStatistics(record); if(aliStatistics.getPayAmount() > 0){ - AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.aliRefundStatistics(record); + AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.wxRefundStatistics(record); aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 59d8a08a4..8b41c3749 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -248,7 +248,7 @@ GROUP BY merchant_id - order by payAmount desc; + order by payAmount desc SELECT merchant_id as 'merchantId', - IFNULL(SUM(`pay_amount`),0) as 'payAmount', - IFNULL(SUM(`increased_points`),0) as 'payPoints' + IFNULL(SUM(`pay_amount`),0) as 'payAmount', + IFNULL(SUM(`increased_points`),0) as 'payPoints' FROM wx_business_circle_order - where is_refund = 0 and merchant_id is not null + where is_refund = 0 and `tenant_id` = #{tenantId} @@ -280,10 +280,10 @@ GROUP BY merchant_id - order by payAmount desc; + order by payAmount desc - SELECT merchant_id as 'merchantId', IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' @@ -304,7 +304,7 @@ GROUP BY merchant_id - SELECT IFNULL(SUM(`pay_amount`),0) as 'payAmount', IFNULL(SUM(`increased_points`),0) as 'payPoints' @@ -324,7 +324,7 @@ - SELECT IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' From 98ece84b2e19d1fd9d2add6a0b1e0161289b0b7d Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Jul 2023 19:08:46 +0800 Subject: [PATCH 19/26] //..circle --- .../AliBusinessCircleOrderController.java | 4 +-- .../mapper/AliBusinessCircleOrderMapper.xml | 25 +++++++++++++++++++ .../mapper/WxBusinessCircleOrderMapper.xml | 24 ++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index c2b6919f7..b18bb0579 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -52,7 +52,7 @@ public class AliBusinessCircleOrderController extends BaseController { } circleOrder.updateTenantInfo(getTenantInfo()); circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); - final PageInfo page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); + PageInfo page = aliBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -123,7 +123,7 @@ public class AliBusinessCircleOrderController extends BaseController { circleOrder = new AliBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - final PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); + PageInfo page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 8b41c3749..1a1736abb 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -241,12 +241,19 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in #{id} + GROUP BY merchant_id order by payAmount desc @@ -263,6 +270,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -285,6 +298,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -305,6 +324,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 4d3ec570e..1718a67c4 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -273,6 +273,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -295,6 +301,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -316,6 +328,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in @@ -336,6 +354,12 @@ and `parent_tenant_id` = #{parentTenantId} + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} + and merchant_id in From 12089d7d6fce78391b72e7ef3656b15d1f4fde2b Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 14:08:45 +0800 Subject: [PATCH 20/26] //..circle --- .../java/com/iformall/domain/vo/AlipayOrWxStatistics.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index 0687b5ae2..b8bf5ae4e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -12,7 +12,7 @@ public class AlipayOrWxStatistics implements Serializable { private String merchantName;//商户名称 private Integer payAmount;//支付总金额 private Integer refundAmount;//退款总金额 - private Integer payPoints;//支付总积分 - private Integer refundPoints;//支付总积分 + private Integer payPoints;//支付添加总积分 + private Integer refundPoints;//支付退款扣减总积分 private Long merchantId; } From 9229fbf2848bf2e5bfe712b4501a85a80d49f273 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 15:05:55 +0800 Subject: [PATCH 21/26] //..circle --- .../src/main/resources/mapper/WxBusinessCircleOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 1718a67c4..08cba39d4 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -320,7 +320,7 @@ SELECT IFNULL(SUM(`pay_amount`),0) as 'payAmount', IFNULL(SUM(`increased_points`),0) as 'payPoints' - FROM ali_business_circle_order + FROM wx_business_circle_order where is_refund = 0 and `tenant_id` = #{tenantId} @@ -346,7 +346,7 @@ SELECT IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' - FROM ali_business_circle_order + FROM wx_business_circle_order where is_refund = 1 and `tenant_id` = #{tenantId} From 077ae07e72a6c0e9a71778ee4ce1988a5bf21402 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 15:28:16 +0800 Subject: [PATCH 22/26] //..circle --- .../AliBusinessCircleOrderController.java | 11 ++++ .../WxBusinessCircleOrderController.java | 11 ++++ .../domain/vo/AlipayOrWxStatistics.java | 22 ++++++++ .../AliBusinessCircleOrderService.java | 2 + .../service/WxBusinessCircleOrderService.java | 1 + .../AliBusinessCircleOrderServiceImpl.java | 52 ++++++++++++++++++- .../WxBusinessCircleOrderServiceImpl.java | 52 ++++++++++++++++++- 7 files changed, 149 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index b18bb0579..581bb1e4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -142,4 +142,15 @@ public class AliBusinessCircleOrderController extends BaseController { return new ResultData(aliStatistics); } + @GetMapping("exportStatisticsData") + @SystemControllerLog(description = "导出数据") + public void exportStatisticsData(@ModelAttribute AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::exportStatisticsData"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + aliBusinessCircleOrderService.exportStatisticsData(circleOrder, request, response); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 071c53126..63464c9f0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -138,4 +138,15 @@ public class WxBusinessCircleOrderController extends BaseController { return new ResultData(aliStatistics); } + @GetMapping("exportStatisticsData") + @SystemControllerLog(description = "导出数据") + public void exportStatisticsData(@ModelAttribute WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::exportStatisticsData"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + wxBusinessCircleOrderService.exportStatisticsData(circleOrder, request, response); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index b8bf5ae4e..5b5fc7d85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -1,18 +1,40 @@ package com.iformall.domain.vo; +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; @Data public class AlipayOrWxStatistics implements Serializable { private static final long serialVersionUID = 1L; + @Excel(name = "商户名称", width = 20, orderNum = "2") private String merchantName;//商户名称 + private Integer payAmount;//支付总金额 + @Excel(name = "支付金额(元)", width = 20, orderNum = "3") + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="用户实际付款金额,单位(元)",name="payAmountStr") + private String payAmountStr; + public String getPayAmountStr() { + return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr; + } private Integer refundAmount;//退款总金额 + @Excel(name = "退款金额(元)", width = 20, orderNum = "4") + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr") + private String refundAmountStr; + public String getRefundAmountStr() { + return refundAmount != null ? new BigDecimal(refundAmount).divide(new BigDecimal(100)).toPlainString(): refundAmountStr; + } + @Excel(name = "支付积分", width = 20, orderNum = "5") private Integer payPoints;//支付添加总积分 + @Excel(name = "退款积分", width = 20, orderNum = "6") private Integer refundPoints;//支付退款扣减总积分 + @Excel(name = "商户ID", width = 20, orderNum = "1") private Long merchantId; } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index 22a99ec34..f5feacda4 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -62,4 +62,6 @@ public interface AliBusinessCircleOrderService { PageInfo aliPayList(AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder circleOrder); + + void exportStatisticsData(AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 86307a6fd..fd14706e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -95,4 +95,5 @@ public interface WxBusinessCircleOrderService { AlipayOrWxStatistics wxStatistics(WxBusinessCircleOrder circleOrder); + void exportStatisticsData(WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index a8a09ced6..55c7b732d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -423,7 +423,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); } if(StringUtils.isBlank(statistics.getMerchantName())){ - statistics.setMerchantName("其他"); + statistics.setMerchantName("未知门店"); } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); @@ -456,4 +456,54 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder return aliStatistics; } + + @Override + public void exportStatisticsData(AliBusinessCircleOrder record, HttpServletRequest request, HttpServletResponse response) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + List aliStatistics = aliBusinessCircleOrderMapper.aliPayList(record); + + List list = aliStatistics.parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + + Map statisticsMap = null; + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } + + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } + + for (AlipayOrWxStatistics statistics:aliStatistics) { + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("未知门店"); + } + if(statisticsMap != null){ + AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); + if(refundstatistics != null){ + statistics.setRefundAmount(refundstatistics.getRefundAmount()); + statistics.setRefundPoints(refundstatistics.getRefundPoints()); + } + } + } + excelService.exportExcel(aliStatistics, null, "支付宝商圈统计", AlipayOrWxStatistics.class, "支付宝商圈统计.xlsx", response, false); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 7e1a89358..2d51ae4c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -598,7 +598,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); } if(StringUtils.isBlank(statistics.getMerchantName())){ - statistics.setMerchantName("其他"); + statistics.setMerchantName("未知门店"); } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); @@ -632,5 +632,55 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe return aliStatistics; } + @Override + public void exportStatisticsData(WxBusinessCircleOrder record, HttpServletRequest request, HttpServletResponse response) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + List wxStatistics = wxBusinessCircleOrderMapper.wxPayList(record); + + List list = wxStatistics.parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + + Map statisticsMap = null; + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List wxpayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + + if (CollectionUtils.isNotEmpty(wxpayOrWxStatistics)) { + statisticsMap = wxpayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } + + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } + + for (AlipayOrWxStatistics statistics:wxStatistics) { + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("未知门店"); + } + if(statisticsMap != null){ + AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); + if(refundstatistics != null){ + statistics.setRefundAmount(refundstatistics.getRefundAmount()); + statistics.setRefundPoints(refundstatistics.getRefundPoints()); + } + } + } + excelService.exportExcel(wxStatistics, null, "微信商圈统计", AlipayOrWxStatistics.class, "微信商圈统计.xlsx", response, false); + } + } From a6d29733deb4a9b2c69c858676acf89193c1fef4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 15:32:33 +0800 Subject: [PATCH 23/26] //..circle --- .../controller/market/WxBusinessCircleOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 63464c9f0..c6a8649bd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -141,7 +141,7 @@ public class WxBusinessCircleOrderController extends BaseController { @GetMapping("exportStatisticsData") @SystemControllerLog(description = "导出数据") public void exportStatisticsData(@ModelAttribute WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::exportStatisticsData"); + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::exportStatisticsData"); if (null == circleOrder) { circleOrder = new WxBusinessCircleOrder(); } From c1cdf36470a3546d56a33bfe8071f144ff764e59 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 16:06:12 +0800 Subject: [PATCH 24/26] //..circle --- .../com/iformall/domain/vo/AlipayOrWxStatistics.java | 4 ++-- .../impl/AliBusinessCircleOrderServiceImpl.java | 12 ++++++++++++ .../impl/WxBusinessCircleOrderServiceImpl.java | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index 5b5fc7d85..0a6976c8a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -24,14 +24,14 @@ public class AlipayOrWxStatistics implements Serializable { return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr; } private Integer refundAmount;//退款总金额 - @Excel(name = "退款金额(元)", width = 20, orderNum = "4") + @Excel(name = "退款金额(元)", width = 20, orderNum = "5") @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr") private String refundAmountStr; public String getRefundAmountStr() { return refundAmount != null ? new BigDecimal(refundAmount).divide(new BigDecimal(100)).toPlainString(): refundAmountStr; } - @Excel(name = "支付积分", width = 20, orderNum = "5") + @Excel(name = "支付积分", width = 20, orderNum = "4") private Integer payPoints;//支付添加总积分 @Excel(name = "退款积分", width = 20, orderNum = "6") private Integer refundPoints;//支付退款扣减总积分 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 55c7b732d..67fa0080f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -432,6 +432,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } return pageInfo; } @@ -453,6 +457,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } + if(aliStatistics.getRefundAmount() == null){ + aliStatistics.setRefundAmount(0); + aliStatistics.setRefundPoints(0); + } return aliStatistics; } @@ -503,6 +511,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } excelService.exportExcel(aliStatistics, null, "支付宝商圈统计", AlipayOrWxStatistics.class, "支付宝商圈统计.xlsx", response, false); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 2d51ae4c5..622b42bda 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -607,6 +607,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } return pageInfo; } @@ -628,6 +632,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } + if(aliStatistics.getRefundAmount() == null){ + aliStatistics.setRefundAmount(0); + aliStatistics.setRefundPoints(0); + } return aliStatistics; } @@ -678,6 +686,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } excelService.exportExcel(wxStatistics, null, "微信商圈统计", AlipayOrWxStatistics.class, "微信商圈统计.xlsx", response, false); } From 04cf935a279e8de3da211cd7869398215e23525a Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 12 Jul 2023 11:07:20 +0800 Subject: [PATCH 25/26] fix car bug --- .../service/park/impl/ketuo/KeTuoParkService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java index 82f0a968b..58a846fdc 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.ketuo; +import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -122,7 +123,8 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ if (null == retObject ) { throw new MallinkException(retObj.getInteger("resCode"), "ketuo getCarStopFee error. no order result"+carNumber); } - Double totalFee = retObject.getDouble("payable"); + Double totalFee = retObject.getDouble("payable");//分 + String _fee = String.valueOf(new BigDecimal(totalFee).divide(new BigDecimal(100)).doubleValue()); String appId = "wx54e676273869baa6"; String parkOrderId = retObject.getString("orderNo"); Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); @@ -130,7 +132,7 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ String endTime = retObject.getString("payTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String payPath = "pages/index/index?lotId="+Integer.parseInt(park.getParkingId())+"&lpn="+carNumber; return new ParkStopFee(parkOrderId,ketuo.utcToLocal(createTime),ketuo.utcToLocal(endTime), - String.valueOf(totalFee),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); + _fee,appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); }else { logger.error("ketuoCarStopFee error. paramMap: {} . ketuoResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("resMsg"); @@ -167,7 +169,8 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ boolean isReduceMoney = this.isReduceMoney(coupon); Integer reduceValue = this.getReduceValue(coupon); - String executeRet = ketuo.executediscount(park, fee.getOrderId(), planNo, Integer.parseInt(fee.getRemainingFee()),isReduceMoney, reduceValue); + Integer parkFee = new BigDecimal(fee.getRemainingFee()).multiply(new BigDecimal(100)).intValue(); + String executeRet = ketuo.executediscount(park, fee.getOrderId(), planNo, parkFee,isReduceMoney, reduceValue); logger.info("ketuo executediscount result:"+executeRet); JSONObject executeRetObj = JSON.parseObject(executeRet); if (executeRetObj.getIntValue("resCode") == 0){ From 86780cd8adfc4a58e4e600024e4f818eb0b5af6c Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 12 Jul 2023 11:21:03 +0800 Subject: [PATCH 26/26] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 4725e0262..9a4e7e0f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -74,7 +74,9 @@ public class KeTuoUtil { param.put("payMethod", 1010);//付款方式 if (isDiscountMoney) { param.put("freeMoney", discountValue);//减免总金额(单位 分) + param.put("freeTime", 0); }else { + param.put("freeMoney", 0); param.put("freeTime", discountValue*3600);//减免总时长(单位 秒) } param.put("isCarLeave", 0);//车辆是否离场