From dbc747e1b12605435e467e0f4751aabfce85c605 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 26 Sep 2019 15:00:43 +0800 Subject: [PATCH 01/13] =?UTF-8?q?[B=E7=AB=AF=E5=88=86=E8=B4=A6=E8=B4=A6?= =?UTF-8?q?=E6=88=B7][=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 69ecbd91f..7b9b79baf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -52,6 +52,9 @@ public class WxMerchantController extends BaseController { @PostMapping("/updateAccount") public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); + if (!hasPermission()) { + return new ResultData(ErrorCode.USER_NO_PERMISSION); + } if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); } @@ -76,6 +79,9 @@ public class WxMerchantController extends BaseController { @ApiImplicitParam(name = "id", value = "商户分账账户ID", dataType = "Long", paramType = "query", required = true) public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) { log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId"); + if (!hasPermission()) { + return new ResultData(ErrorCode.USER_NO_PERMISSION); + } if (receiver.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); } @@ -87,16 +93,17 @@ public class WxMerchantController extends BaseController { @GetMapping("/permitModifiy") public ResultData permitModifiy() { log.debug("[" + getIpAddr() + "] WxMerchantController::permitModifiy"); + boolean has = hasPermission(); + return new ResultData(has); + } + + public boolean hasPermission() { WxMerchantBUser user = getUser(); WxBuser buser = getBuser(); WxMerchant merchant = new WxMerchant(); merchant.setId(user.getMerchantId()); WxMerchant wxMerchant = wxMerchantService.findOne(merchant); - if (wxMerchant == null) { - return new ResultData(false); - } - boolean has = buser.getPhone().equals(wxMerchant.getLinkPhone()); - return new ResultData(has); + return wxMerchant != null && buser.getPhone().equals(wxMerchant.getLinkPhone()); } } From eed7a51f3a77d3daa2e6237369845eb5404bffc9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 26 Sep 2019 15:39:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][B=E7=AB=AF=E8=AE=BF=E9=97=AE=E6=97=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxMerchantController.java | 14 -------------- .../controller/WxMerchantBUserController.java | 10 +++++++++- .../service/impl/WxScoreRulesServiceImpl.java | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6d6e54c1d..9e0442cf7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -9,10 +9,8 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.domain.po.WxScoreRules; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; -import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.service.QrCodeService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxScoreRulesService; @@ -106,12 +104,6 @@ public class WxMerchantController extends BaseController { public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); WxMerchant wxMerchant = wxMerchantService.getById(id); - if (wxMerchant.getCreditLocked() != null) { - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); - if (scoreRules != null && scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { - wxMerchant.setCreditLocked(EnumCreditLockedStatus.CLOSE.getCode()); - } - } return new ResultData(wxMerchant); } @@ -201,12 +193,6 @@ public class WxMerchantController extends BaseController { public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); wxMerchant.setTenantId(getTenantId()); - if (wxMerchant.getCreditLocked() != null) { - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); - if (scoreRules != null && scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { - wxMerchant.setCreditLocked(EnumCreditLockedStatus.CLOSE.getCode()); - } - } return wxMerchantService.updateMerchantLevel(wxMerchant); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index b2d97c443..20daa1fde 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -7,6 +7,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.WxScoreRules; +import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.*; @@ -50,6 +52,8 @@ public class WxMerchantBUserController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired + private WxScoreRulesService wxScoreRulesService; @ApiOperation("查寻当bUser详情接口") @GetMapping("/detail") @@ -72,6 +76,11 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } + resultMap.put("creditLocked", merchant.getCreditLocked()); + WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(user.getTenantId()); + if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { + resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); + } resultMap.put("phone", user.getPhone()); resultMap.put("name", user.getName()); resultMap.put("merchant_name", merchant.getName()); @@ -81,7 +90,6 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("tenant_id",merchant.getTenantId()); resultMap.put("merchant_id",merchant.getId()); resultMap.put("is_admin",merchant.getIsAdmin()); - resultMap.put("creditLocked", merchant.getCreditLocked()); resultMap.put("businessId", merchant.getBusinessId()); String mid = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 5055d003d..b04daf8fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -190,7 +190,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } //更新商户数据 - updateMerchantCreditLocked(record); + //updateMerchantCreditLocked(record); } @Override From 45fd127152945bd57a029386aeeafa2d54eb74e0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 10:51:28 +0800 Subject: [PATCH 03/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93][=E4=BF=AE=E6=94=B9=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/WxMerchantController.java | 28 +++++++++++++++++++ .../domain/vo/WxMerchantTradeDetailVo.java | 28 +++++++++++++++++++ .../iformall/domain/vo/WxMerchantTradeVo.java | 1 + .../iformall/service/WxMerchantService.java | 21 ++++++++++++++ .../service/impl/WxMerchantServiceImpl.java | 6 ++++ 5 files changed, 84 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 9e0442cf7..6c7ed898b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -14,6 +14,7 @@ import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.QrCodeService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxScoreRulesService; +import com.iformall.utils.DateUtils; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -24,6 +25,10 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -267,4 +272,27 @@ public class WxMerchantController extends BaseController { return new ResultData(page); } + @ApiOperation("商户会员消费明细列表接口") + @GetMapping("userTradeDetailList") + @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 userTradeDetailList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + final PageInfo page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("导出商户会员消费分页列表") + @GetMapping("exportUserTradeList") + @SystemControllerLog(description = "导出商户会员消费分页列表") + public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ + logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeList"); + wxMerchantService.exportUserTradeList(wxMerchant, request,response); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java new file mode 100644 index 000000000..230730366 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java @@ -0,0 +1,28 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxMerchantTradeDetailVo extends BaseEntity { + @io.swagger.annotations.ApiModelProperty(value = "会员昵称", name = "userName") + protected String userName; + @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "cover") + private String cover; + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") + private String merchantName; + @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkName") + private String linkName; + @io.swagger.annotations.ApiModelProperty(value = "消费会员人数", name = "consumeCount") + private Integer consumeCount; + @io.swagger.annotations.ApiModelProperty(value = "消费会员人次(去重)", name = "consumeCountP") + private Integer consumeCountP; + @io.swagger.annotations.ApiModelProperty(value = "会员消费金额", name = "tradeAmt") + private Integer tradeAmt; + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java index 8c825de66..b798a976a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeVo.java @@ -9,6 +9,7 @@ import lombok.ToString; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantTradeVo extends BaseEntity { + @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") protected Long id; @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "cover") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 9115ec06d..1e7fd39aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -3,11 +3,13 @@ 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.WxBillOtherDeposit; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; +import org.springframework.web.bind.annotation.ModelAttribute; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,6 +21,18 @@ import java.util.Optional; * @author gongbiao */ public interface WxMerchantService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo userTradeDetailList(WxMerchant record, Integer pageIndex, Integer pageSize); + + /** * 根据实体查询分页列表 * @@ -29,6 +43,13 @@ public interface WxMerchantService { */ PageInfo userTradeList(WxMerchant record, Integer pageIndex, Integer pageSize); + /** + * 根据实体查询分页列表 + * + * @return + */ + void exportUserTradeList(@ModelAttribute WxMerchant record, HttpServletRequest request, HttpServletResponse response); + /** * 根据实体查询分页列表 * 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 875af3f51..2b6a2964b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -745,4 +745,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { public PageInfo userTradeList(WxMerchant record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.userTradeList(record)); } + + @Override + public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { + List datalist = wxMerchantMapper.userTradeList(record); + excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeVo.class, "商户会员消费列表.xlsx", response, false); + } } From 0d33a3f20fc1603dde026ceead532aa9f2d07c19 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 14:08:45 +0800 Subject: [PATCH 04/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93][=E4=BF=AE=E6=94=B9=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201909261053__G_MENU_CHANGED.sql | 29 ++++++++++++++ .../V201909261054__L_MENU_CHANGED.sql | 1 + .../domain/vo/WxMerchantTradeDetailVo.java | 39 +++++++++++++------ .../com/iformall/mapper/WxMerchantMapper.java | 3 ++ .../iformall/service/WxMerchantService.java | 3 +- .../service/impl/WxMerchantServiceImpl.java | 7 +++- .../resources/mapper/WxMerchantMapper.xml | 9 +++++ 7 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql new file mode 100644 index 000000000..83fc06834 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql @@ -0,0 +1,29 @@ + +INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES + (963, '商户会员消费列表', 2, 'Y', NULL, 1, NULL, NULL, 'merchantConsumeList', 'icon-xiaofeijilu', 0, 963); + +DROP TABLE IF EXISTS `mall_sale_type` ; +CREATE TABLE `mall_sale_type` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '销售类型', + `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', + `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', + `menus` json DEFAULT NULL COMMENT '菜单列表', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_sale_type` + (`id`,`name`, `type`, `period`, `menus`) +VALUES + (1, '尊享全能版', 1, 12, + '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 201, 202, 203, 204, 205, 206, 211, 212, 221, 222, 251, 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, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 651, 661, 662, 663, 671, 672, 673,674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 711, 712, 713, 901, 902, 903, 931, 932, 951, 952, 961, 962,963, 965, 966, 967, 968, 1001, 1002, 1003, 1004]' + ), + (2, '尊享营销版', 2, 12, + '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 651, 661, 662, 663, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 711, 712, 713, 901, 902, 903, 931, 932, 951, 961]' + ), + (3, '速享版', 3, 1, + '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 651, 661, 662, 663, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 711, 712, 713, 901, 902, 903, 931, 932]' + ) + ; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql new file mode 100644 index 000000000..71a0c2e3e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql @@ -0,0 +1 @@ +update mall_permission set module_color='#ad368a',module_color_num='173,54,138' where name = '招商管理'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java index 230730366..522590acc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java @@ -1,28 +1,45 @@ package com.iformall.domain.vo; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantTradeDetailVo extends BaseEntity { + @Excel(name="会员昵称",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "会员昵称", name = "userName") protected String userName; - @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "cover") - private String cover; - @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") - private String merchantName; - @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkName") - private String linkName; - @io.swagger.annotations.ApiModelProperty(value = "消费会员人数", name = "consumeCount") - private Integer consumeCount; - @io.swagger.annotations.ApiModelProperty(value = "消费会员人次(去重)", name = "consumeCountP") - private Integer consumeCountP; - @io.swagger.annotations.ApiModelProperty(value = "会员消费金额", name = "tradeAmt") + + @Excel(name="手机号码",width = 20,orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value = "手机号码", name = "phone") + private String phone; + + @Excel(name="核销券名称",width = 20,orderNum = "3") + @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") + private String couponName; + + @Excel(name="券价格",width = 20,orderNum = "4") + @io.swagger.annotations.ApiModelProperty(value = "券价格", name = "couponSale") + private Integer couponSale; + + @Excel(name="券面额",width = 20,orderNum = "5") + @io.swagger.annotations.ApiModelProperty(value = "核销券面额", name = "couponPrice") + private Integer couponPrice; + + @Excel(name="消费金额",width = 20,orderNum = "6") + @io.swagger.annotations.ApiModelProperty(value = "消费金额", name = "tradeAmt") private Integer tradeAmt; + @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") + private Date tradeDate; + + @Excel(name="交易时间",width = 20,orderNum = "7") + @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") + private Date tradeDateStr; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 85ebcc787..a88e38eea 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; @@ -30,5 +31,7 @@ public interface WxMerchantMapper extends CommonMapper { List userTradeList(WxMerchant wxMerchant); + List userTradeDetailList(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 1e7fd39aa..5fc8b49c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; +import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import org.springframework.web.bind.annotation.ModelAttribute; @@ -30,7 +31,7 @@ public interface WxMerchantService { * @param pageSize * @return */ - PageInfo userTradeDetailList(WxMerchant record, Integer pageIndex, Integer pageSize); + PageInfo userTradeDetailList(WxMerchant record, Integer pageIndex, Integer pageSize); /** 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 2b6a2964b..032cbd6a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxMerchantSimpleVo; +import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; @@ -32,7 +33,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; - /** * @author gongbiao */ @@ -751,4 +751,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { List datalist = wxMerchantMapper.userTradeList(record); excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeVo.class, "商户会员消费列表.xlsx", response, false); } + + @Override + public PageInfo userTradeDetailList(WxMerchant record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.userTradeDetailList(record)); + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 26b2af585..6ffe64141 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -474,5 +474,14 @@ + + From a37cb6244a653a33c6023557e322b756aad5fdc5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 15:45:55 +0800 Subject: [PATCH 05/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98][=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxMerchantController.java | 10 ++++++---- ...U_CHANGED.sql => V201909261528__G_MENU_CHANGED.sql} | 0 ...U_CHANGED.sql => V201909261529__L_MENU_CHANGED.sql} | 0 .../iformall/service/impl/WxMerchantServiceImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201909261053__G_MENU_CHANGED.sql => V201909261528__G_MENU_CHANGED.sql} (100%) rename mallinkAdmin/src/main/resources/db/migration/{V201909261054__L_MENU_CHANGED.sql => V201909261529__L_MENU_CHANGED.sql} (100%) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6c7ed898b..77cbfeaa8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -9,6 +9,9 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; +import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxBusinessDataVo; +import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.QrCodeService; @@ -282,16 +285,15 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); - final PageInfo page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); + final PageInfo page = wxMerchantService.userTradeDetailList(wxMerchant, pageNum, pageSize); return new ResultData(page); } @ApiOperation("导出商户会员消费分页列表") - @GetMapping("exportUserTradeList") + @GetMapping("exportUserTradeDetailList") @SystemControllerLog(description = "导出商户会员消费分页列表") public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ - logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeList"); + logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList"); wxMerchantService.exportUserTradeList(wxMerchant, request,response); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql rename to mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql rename to mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql 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 032cbd6a4..cfe9f2610 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -748,8 +748,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { - List datalist = wxMerchantMapper.userTradeList(record); - excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeVo.class, "商户会员消费列表.xlsx", response, false); + List datalist = wxMerchantMapper.userTradeDetailList(record); + excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false); } @Override From 74276228a4a905eb6697b53b4ed3503a3b4a03c8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 15:52:45 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98][=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMerchantMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 6ffe64141..a23f5229b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -480,7 +480,11 @@ left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) inner join wx_c_user_basic_info c on(o.c_user_id=c.id) - where o.coupon_order_status=1 and o.tenant_id=#{tenantId} order by o.create_date desc + where o.coupon_order_status=1 and o.tenant_id=#{tenantId} + + and co.`id` = #{id} + + order by o.create_date desc From 7eb1c1c874b220719ee87da1b8d310a710f85687 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 15:53:37 +0800 Subject: [PATCH 07/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98][=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index a23f5229b..a47dfdbe0 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -482,7 +482,7 @@ inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where o.coupon_order_status=1 and o.tenant_id=#{tenantId} - and co.`id` = #{id} + and cm.`merchant_id` = #{id} order by o.create_date desc From 7bf9a8996a3c64f8f1ef08be368036bd63dfb34f Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 17:57:50 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9][=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCUserBasicInfoController.java | 45 +++++++++++++++++++ .../com/iformall/domain/po/WxMerchant.java | 7 +++ .../iformall/domain/vo/UserTradeRecordVo.java | 24 ++++++++++ .../resources/mapper/WxMerchantMapper.xml | 10 +++++ 4 files changed, 86 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 7b5e09d56..8215aad8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -11,10 +11,14 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.po.*; +import com.iformall.domain.vo.UserTradeRecordVo; import com.iformall.enums.EnumAssignTagsTrigger; +import com.iformall.enums.EnumCouponOrderStatus; +import com.iformall.enums.EnumCouponStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.utils.Constant; +import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,6 +37,7 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -75,6 +80,9 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired private AsyncTask asyncTask; + @Autowired + private ExcelService excelService; + private void setUserInfoLevel(WxCUserBasicInfo info) { if (info.getPoins() == null || info.getPoins() == 0) { @@ -241,6 +249,43 @@ public class WxCUserBasicInfoController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", page); } + @ApiOperation("导出根据userId查询交易记录接口") + @GetMapping("/exportOrderCouponByUserId") + @ApiImplicitParam(name = "userId", value = "userId", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "会员管理-userId查询交易记录") + public void exportOrderCouponByUserId(HttpServletRequest request, HttpServletResponse response,Long userId) { + logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportOrderCouponByUserId"); + WxCouponOrder corder = new WxCouponOrder(); + corder.setCUserId(userId); + corder.setTenantId(getTenantId()); + corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + PageInfo page = wxCouponOrderService.listAsPage(corder, 1, Integer.MAX_VALUE); + if (page.getSize() > 0) { + List list = page.getList(); + for (WxCouponOrder c : list) { + WxCoupon coupon = wxCouponService.getById(c.getCouponId()); + c.setCouponName(coupon.getTitle()); + c.setSalePrice(coupon.getPrice()); + } + + List datalist = new ArrayList<>(); + for (WxCouponOrder wxCouponOrder:list) { + UserTradeRecordVo userTradeRecordVo = new UserTradeRecordVo(); + userTradeRecordVo.setCouponName(wxCouponOrder.getCouponName()); + BigDecimal b = new BigDecimal(wxCouponOrder.getSalePrice()); + userTradeRecordVo.setPrice(b.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP).toString()); + b = new BigDecimal(wxCouponOrder.getCouponPrice()); + userTradeRecordVo.setSale(b.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP).toString()); + userTradeRecordVo.setStatus(EnumCouponOrderStatus.getEnum(wxCouponOrder.getCouponOrderStatus()).getMessage()); + userTradeRecordVo.setTradeTime(DateUtils.formatDateTime(wxCouponOrder.getCreateDate())); + datalist.add(userTradeRecordVo); + } + excelService.exportExcel(datalist, null, "会员交易记录", UserTradeRecordVo.class, "会员交易记录.xlsx", response, false); + } + + + } + @ApiOperation("会员记录导出总数") @GetMapping("/exportDataCount") @SystemControllerLog(description = "会员管理-会员记录导出总数") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 5fd723c25..53c4c3efb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -131,6 +131,13 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") private transient Date endtime; + @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "userName") + private transient String userName; + @io.swagger.annotations.ApiModelProperty(value = "联系方式", name = "phone") + private transient String phone; + @io.swagger.annotations.ApiModelProperty(value = "卷名称", name = "couponName") + private transient String couponName; + public String getShopsStr() { if (shopVos != null && shopVos.size() > 0) { return String.join("\n", diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java new file mode 100644 index 000000000..c23014fbc --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java @@ -0,0 +1,24 @@ +package com.iformall.domain.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import java.io.Serializable; + +@Data +public class UserTradeRecordVo implements Serializable{ + + private static final long serialVersionUID = 1L; + + @Excel(name="优惠券名称",width = 20,orderNum = "1") + private String couponName; + //@Excel(name="交易门店",width = 20,orderNum = "2") + private String shopName; + @Excel(name="价格",width = 20,orderNum = "2") + private String sale; + @Excel(name="面额",width = 20,orderNum = "3") + private String price; + @Excel(name="卷状态",width = 20,orderNum = "4") + private String status; + @Excel(name="交易时间",width = 20,orderNum = "5") + private String tradeTime; +} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index a47dfdbe0..53dcdb3f9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -484,6 +484,16 @@ and cm.`merchant_id` = #{id} + + + and c.`nick_name` like concat('%', #{userName},'%') + + + and c.`phone` like concat('%', #{phone},'%') + + + and co.`title` like concat('%', #{couponName},'%') + order by o.create_date desc From 65749c2a9f0e523340049c22aeb17efc3febfc53 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 26 Sep 2019 18:02:26 +0800 Subject: [PATCH 09/13] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][B=E7=AB=AF=E8=AE=BF=E9=97=AE=E6=97=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A7=AF=E5=88=86=E5=BC=80=E5=85=B3=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxMerchantBUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 20daa1fde..536a86ffa 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -77,7 +77,7 @@ public class WxMerchantBUserController extends BaseController { } resultMap.put("creditLocked", merchant.getCreditLocked()); - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(user.getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user.getTenantId()); if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); } From a9982f769b352d0c83a3ffa36a11247b921b58e0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 18:51:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9][=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 77cbfeaa8..2e2d4e1db 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -294,6 +294,8 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "导出商户会员消费分页列表") public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); wxMerchantService.exportUserTradeList(wxMerchant, request,response); } From 6794b05fa58e259d7ac6e8a0dee179d1c36472c0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 26 Sep 2019 19:01:00 +0800 Subject: [PATCH 11/13] =?UTF-8?q?[=E5=82=AC=E7=BC=B4=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AF=BC=E5=87=BA=E4=BB=98=E6=AC=BE=E6=96=B9?= =?UTF-8?q?=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index d6fae6966..cdbde5519 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -704,7 +704,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { String bankCardId = payAccountBill.getBankCardId(); String bankAccountName = payAccountBill.getBankAccountName(); result.put("accountNumber", StringUtils.isNotEmpty(bankCardId) ? bankCardId : " "); - result.put("accountName", StringUtils.isNotEmpty(bankAccountName) ? bankCardId : " "); + result.put("accountName", StringUtils.isNotEmpty(bankAccountName) ? bankAccountName : " "); } else { result.put("accountNumber", " "); result.put("accountName", " "); From 2f330a66f99cf40dc9e6e8a4a911c1272f1bd985 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 19:01:38 +0800 Subject: [PATCH 12/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9][=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index a7ce9be39..ae7eced40 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -509,6 +509,14 @@ and s.`point_type` = #{pointType} + + + and s.shop_number = #{shopNumber} + + + + and b.building_name like concat('%', #{building},'%') + order by ${sortColumns} From 15952ff4c3d24599c282552ad6336d9c9c592732 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 26 Sep 2019 19:02:33 +0800 Subject: [PATCH 13/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B6=88=E8=B4=B9][=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index ae7eced40..37afa1f59 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -510,11 +510,11 @@ and s.`point_type` = #{pointType} - + and s.shop_number = #{shopNumber} - + and b.building_name like concat('%', #{building},'%') order by ${sortColumns}