From 9bb32df838c09bd86f5dc093a5f8e86367d92433 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 7 Sep 2018 20:10:30 +0800 Subject: [PATCH 01/40] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxBillRent.java | 31 ++++++++++--------- .../com/simple/service/WxBillRentService.java | 2 +- .../service/impl/WxBillRentServiceImpl.java | 9 ++++-- .../resources/mapper/WxBillRentMapper.xml | 9 ++++-- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index 1da4e4137..2c4ba19d6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -39,10 +39,8 @@ public class WxBillRent implements Serializable { } @Transient - protected WxMerchant wxMerchant; + protected String shopNumber; - @Transient - protected WxShop wxShop; /*商铺ID**/ @@ -93,6 +91,18 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value="欠缴金额",name="owe") private BigDecimal owe; + /***/ + @io.swagger.annotations.ApiModelProperty(value="payStatus",name="payStatus") + private Integer payStatus; + + + public String getShopNumber() { + return shopNumber; + } + + public void setShopNumber(String shopNumber) { + this.shopNumber = shopNumber; + } public Integer getShopId() { return shopId; @@ -181,13 +191,6 @@ public class WxBillRent implements Serializable { this.tenantId = tenantId; } - public WxMerchant getWxMerchant() { - return wxMerchant; - } - - public void setWxMerchant(WxMerchant wxMerchant) { - this.wxMerchant = wxMerchant; - } public BigDecimal getOwe() { return owe; @@ -197,12 +200,12 @@ public class WxBillRent implements Serializable { this.owe = owe; } - public WxShop getWxShop() { - return wxShop; + public Integer getPayStatus() { + return payStatus; } - public void setWxShop(WxShop wxShop) { - this.wxShop = wxShop; + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; } public static enum Field diff --git a/mallinkService/src/main/java/com/simple/service/WxBillRentService.java b/mallinkService/src/main/java/com/simple/service/WxBillRentService.java index 2e35d4efe..42524eaa6 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBillRentService.java @@ -22,7 +22,7 @@ public interface WxBillRentService { * @param id * @return */ - WxBillRent getById(String id); + Map getById(Long id); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java index 7309d2330..2cf5f2330 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java @@ -27,8 +27,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public WxBillRent getById(String id) { - return wxBillRentMapper.selectByPrimaryKey(id); + public Map getById(Long id) { + WxBillRent record = new WxBillRent(); + record.setId(id); + return wxBillRentMapper.findListMap(record).get(0); } @Override @@ -36,8 +38,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreatetime(new Date()); + record.setPayStatus(record.getOwe().doubleValue()>0?0:1); wxBillRentMapper.insertSelective(record); } else { + record.setPayStatus(record.getOwe().doubleValue()>0?0:1); wxBillRentMapper.updateByPrimaryKeySelective(record); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 9288e348a..6f5de73b2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -18,12 +18,12 @@ - + - `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id`,`owe` + `id`,`shop_id`,`user_area`,`price`,`need_pay`,`receive_pay`,`pay`,`receive_period`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`pay_way`,`receipt_num`,`tenant_id`,`owe`,`pay_status` @@ -61,7 +61,7 @@ select br.id,br.shop_id shopId,br.user_area userArea,br.price,br.need_pay needPay,br.receive_pay receivePay, br.pay,br.receive_period receivePeriod,br.receive_date receiveDate,br.pay_date payDate,br.createtime, br.expired_day expiredDay,br.pay_way payWay,br.receipt_num receiptNum,m.`name` merchantName, - s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber,br.owe + s.build_area buildArea,s.operation_area operationArea,s.shop_number shopNumber,br.owe,br.pay_status payStatus from wx_bill_rent br left join wx_merchant_shop ms on br.shop_id=ms.shop_id and ms.is_del=0 inner join wx_merchant m on ms.merchant_id=m.id inner join wx_shop s on ms.shop_id=s.id @@ -81,6 +81,9 @@ and br.`pay_way` = #{payWay} and br.`receipt_num` = #{receiptNum} and br.`tenant_id` = #{tenantId} + and br.`shop_number` = #{shopNumber} + and br.`pay_status` = #{payStatus} + and br.id in From 0e2d74ff4fc1bb4fd5d5ccb07cea6dba1efacb56 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 7 Sep 2018 20:23:29 +0800 Subject: [PATCH 02/40] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillRentController.java | 8 ++--- .../WxCUserBasicInfoController.java | 30 ++++++++++--------- .../java/com/simple/domain/po/WxBillRent.java | 6 ++-- .../simple/mapper/WxCUserBasicInfoMapper.java | 7 +++-- .../com/simple/service/WxBillRentService.java | 2 +- .../service/WxCUserBasicInfoService.java | 9 ++++-- .../service/impl/WxBillRentServiceImpl.java | 2 +- .../impl/WxCUserBasicInfoServiceImpl.java | 11 +++++-- .../mapper/WxCUserBasicInfoMapper.xml | 14 +++++++++ 9 files changed, 59 insertions(+), 30 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java index eae2c45d6..3cbb7279e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java @@ -50,15 +50,15 @@ public class WxBillRentController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) - public ResultData delete(String id) { + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { wxBillRentService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) - public ResultData findById(String id) { + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxBillRentService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 867d7f84d..f3e14c975 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxCUserBasicInfo") @@ -53,20 +54,21 @@ public class WxCUserBasicInfoController extends BaseController { if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfoDto(); String tenantId = getTenantId(); wxCUserBasicInfo.setTenantId(tenantId); - PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); - if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) - && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null - && StringUtils.isBlank(wxCUserBasicInfo.getName()) - ) {//当只有手机号查询并且查不到数据 ，新增 - WxCUser cUser = new WxCUser(); - cUser.setTenantId(tenantId); - cUser.setPhone(wxCUserBasicInfo.getPhone()); - PageInfo cUsers = wxCUserService.listAsPage(cUser, 1, 1); - if (cUsers.getSize() > 0) { - createUserBasicInfo(cUsers.getList().get(0)); - page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); - } - } + PageInfo> page = wxCUserBasicInfoService.queryListMap(wxCUserBasicInfo, pageNum, pageSize); +// PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); +// if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) +// && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null +// && StringUtils.isBlank(wxCUserBasicInfo.getName()) +// ) {//当只有手机号查询并且查不到数据 ，新增 +// WxCUser cUser = new WxCUser(); +// cUser.setTenantId(tenantId); +// cUser.setPhone(wxCUserBasicInfo.getPhone()); +// PageInfo cUsers = wxCUserService.listAsPage(cUser, 1, 1); +// if (cUsers.getSize() > 0) { +// createUserBasicInfo(cUsers.getList().get(0)); +// page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); +// } +// } return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index 2c4ba19d6..c1a338625 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -17,7 +17,7 @@ public class WxBillRent implements Serializable { protected Long id; @Transient - protected List ids; + protected List ids; @Transient protected String sortColumns; @@ -31,10 +31,10 @@ public class WxBillRent implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + public void setIds(List ids) { this.ids = ids; } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 7bba1edc7..530f6a79a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -1,11 +1,11 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; - import com.simple.domain.dto.WxCUserBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; +import java.util.List; + public interface WxCUserBasicInfoMapper extends CommonMapper { List findList(WxCUserBasicInfo wxCUserBasicInfo); @@ -19,4 +19,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper> queryListMap(WxCUserBasicInfoDto wxCUserBasicInfo, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java index 2cf5f2330..534467e28 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java @@ -48,7 +48,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public void deleteById(String id) { + public void deleteById(Long id) { wxBillRentMapper.deleteByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index 19aee7de4..f30ee53a9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -11,6 +11,8 @@ import com.simple.domain.po.WxCUserBasicInfo; import com.simple.mapper.WxCUserBasicInfoMapper; import com.simple.service.WxCUserBasicInfoService; +import java.util.Map; + @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -75,6 +77,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return wxCUserBasicInfoMapper.findCountByAge(dto); } - - + + @Override + public PageInfo> queryListMap(WxCUserBasicInfoDto record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findListMap(record)); + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 34eada33a..cd82396ac 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -165,4 +165,18 @@ + + + From d9c2bf22f9478b14bde3ae26cc71fed709a4dfd1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 7 Sep 2018 20:28:42 +0800 Subject: [PATCH 03/40] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxBillRentMapper.xml | 2 +- .../mapper/WxCUserBasicInfoMapper.xml | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 6f5de73b2..99a77c499 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -18,7 +18,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index cd82396ac..d4cefec11 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -176,6 +176,26 @@ cubi.sex,cubi.email,cubi.address,cubi.poins,cubi.`name`,cubi.`level`,cubi.id cubiid from wx_c_user cu left join wx_c_user_basic_info cubi on cu.phone=cubi.phone and cu.tenant_id=cubi.tenant_id + where 1=1 + + and cu.`tenant_id` = #{tenantId} + + + and cu.`phone` = #{phone} + + + and cu.`phone` is not null + + + and cubi.create_date >= #{startTime} + + + + and cubi.update_date <= #{endTime} + + + and cb.`name` like concat('%', #{name},'%') + From d39f6e2059cc3afc9c5d64209476ce0f9efece5a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 7 Sep 2018 20:38:25 +0800 Subject: [PATCH 04/40] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/mapper/WxCUserBasicInfoMapper.java | 3 ++- .../com/simple/service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- mallinkService/src/main/resources/mapper/WxBillRentMapper.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 530f6a79a..11c5ef83f 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -5,6 +5,7 @@ import com.simple.domain.dto.WxCUserBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; import java.util.List; +import java.util.Map; public interface WxCUserBasicInfoMapper extends CommonMapper { @@ -20,6 +21,6 @@ public interface WxCUserBasicInfoMapper extends CommonMapper> findListMap(WxCUserBasicInfoDto record); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index f30ee53a9..ea3400f38 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.simple.domain.po.WxCUserBasicInfo; import com.simple.mapper.WxCUserBasicInfoMapper; import com.simple.service.WxCUserBasicInfoService; +import java.util.List; import java.util.Map; @Service @@ -74,7 +75,6 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Override public long findCountByAge(WxCUserBasicInfoDto dto) { - return wxCUserBasicInfoMapper.findCountByAge(dto); } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 99a77c499..347d610b0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -81,7 +81,7 @@ and br.`pay_way` = #{payWay} and br.`receipt_num` = #{receiptNum} and br.`tenant_id` = #{tenantId} - and br.`shop_number` = #{shopNumber} + and s.`shop_number` = #{shopNumber} and br.`pay_status` = #{payStatus} From d6d4935397487b73e0325d62e615cc1a9399858a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 7 Sep 2018 20:57:51 +0800 Subject: [PATCH 05/40] =?UTF-8?q?[=E7=A7=9F=E9=87=91=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/domain/po/WxBillRent.java | 6 +++--- .../src/main/resources/mapper/WxBillRentMapper.xml | 2 +- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index c1a338625..1f34afa78 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -45,7 +45,7 @@ public class WxBillRent implements Serializable { /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") - private Integer shopId; + private Long shopId; /*使用面积**/ @io.swagger.annotations.ApiModelProperty(value="使用面积",name="userArea") private BigDecimal userArea; @@ -104,10 +104,10 @@ public class WxBillRent implements Serializable { this.shopNumber = shopNumber; } - public Integer getShopId() { + public Long getShopId() { return shopId; } - public void setShopId(Integer _shopId) { + public void setShopId(Long _shopId) { shopId = _shopId; } public BigDecimal getUserArea() { diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 347d610b0..bdb5c196f 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -81,7 +81,7 @@ and br.`pay_way` = #{payWay} and br.`receipt_num` = #{receiptNum} and br.`tenant_id` = #{tenantId} - and s.`shop_number` = #{shopNumber} + and s.`shop_number` = #{shopNumber} and br.`pay_status` = #{payStatus} diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index d08480203..327c0f053 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -228,16 +228,16 @@ From 581ecd8ce2a4b6d1ebcaac833a117154d8a8bc2b Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 10:40:38 +0800 Subject: [PATCH 06/40] =?UTF-8?q?[c=E7=AB=AFlog=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8D=87=E7=BA=A7]:log4j=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBusinessController.java | 5 +- .../controller/WxCampaignController.java | 80 ++++++++--------- .../simple/controller/WxCarController.java | 8 +- .../controller/WxCouponCarController.java | 6 +- .../controller/WxCouponChannelController.java | 8 +- .../simple/controller/WxCouponController.java | 24 +++-- .../controller/WxCouponOrderController.java | 23 +++-- .../simple/controller/WxMallController.java | 11 +-- .../WxMsgValidationcodeController.java | 8 +- .../simple/controller/WxOrderController.java | 37 ++++---- .../simple/controller/WxParkController.java | 13 ++- .../controller/WxPayOrderController.java | 90 ++++++++----------- .../controller/WxScoreHistoryController.java | 50 +++++------ .../controller/WxUserGrantController.java | 2 +- .../java/com/simple/domain/po/WxCUser.java | 4 +- 15 files changed, 175 insertions(+), 194 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java index 0660448ef..59b7b01e5 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -9,7 +9,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/wxBusiness") @Api(description = "业态查询接口") public class WxBusinessController extends BaseController { - private Logger logger = Logger.getLogger(WxBusinessController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxBusinessService wxBusinessService; diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java index c28ef7d45..217e0d80b 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java @@ -1,11 +1,9 @@ package com.simple.controller; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCampaign; -import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponChannelVo; import com.simple.enums.EnumCouponChannelType; @@ -16,35 +14,36 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.List; import static com.simple.domain.po.WxCampaign.Field.SortNum_ASC; @RestController @RequestMapping("/api/wxCampaign") -@Api(description="促销和banner接口") -public class WxCampaignController extends BaseController -{ - @Autowired +@Api(description = "促销和banner接口") +public class WxCampaignController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCampaignService wxCampaignService; - @Autowired + @Autowired private WxCouponService wxCouponService; @Autowired private WxCouponChannelService wxCouponChannelService; - private Logger logger = Logger.getLogger(WxCampaignController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { if (null == wxCampaign) wxCampaign = new WxCampaign(); @@ -54,41 +53,42 @@ public class WxCampaignController extends BaseController final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - WxCampaign wxCampaign = wxCampaignService.getById(id); - if (wxCampaign != null) { - WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); - wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); - wxCouponChannel.setSubTargetId(wxCampaign.getId()); - wxCouponChannel.setStatus(0); - List couponList = wxCouponChannelService.listAPI(wxCouponChannel); - wxCampaign.setCoupons(couponList); - } - return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); - } + WxCampaign wxCampaign = wxCampaignService.getById(id); + if (wxCampaign != null) { + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); + wxCouponChannel.setSubTargetId(wxCampaign.getId()); + wxCouponChannel.setStatus(0); + List couponList = wxCouponChannelService.listAPI(wxCouponChannel); + wxCampaign.setCoupons(couponList); + } + return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); + } @ApiOperation("调整顺序") @GetMapping("/move") @ApiImplicitParams({ - @ApiImplicitParam(name="sourceId",value="",dataType="Long", paramType = "query",required=true), - @ApiImplicitParam(name="targetId",value="",dataType="Long", paramType = "query",required=true)}) - public ResultData move(Long sourceId,Long targetId) { - WxCampaign source = wxCampaignService.getById(sourceId); + @ApiImplicitParam(name = "sourceId", value = "", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "targetId", value = "", dataType = "Long", paramType = "query", required = true)}) + public ResultData move(Long sourceId, Long targetId) { + WxCampaign source = wxCampaignService.getById(sourceId); WxCampaign target = wxCampaignService.getById(targetId); - if(source==null||target==null){ + if (source == null || target == null) { return new ResultData(Result.ERROR, "调整顺序失败", null); } - int temp =source.getSortNum(); + int temp = source.getSortNum(); source.setSortNum(target.getSortNum()); target.setSortNum(temp); wxCampaignService.saveOrUpdate(source); wxCampaignService.saveOrUpdate(target); return new ResultData(Result.SUCCESS, "调整顺序成功", null); } - - + + } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index ff7a468c3..ba7ba1397 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -17,7 +17,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,9 +30,8 @@ import java.util.Map; @RestController @RequestMapping("/api/car") @Api(description = "智慧停车相关接口") -public class WxCarController extends BaseController -{ - private Logger logger = Logger.getLogger(WxCarController.class); +public class WxCarController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); ETCPUtil etcp = new ETCPUtil(); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java index 092b6460e..481d51b5c 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java @@ -9,7 +9,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,11 +18,10 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("wxCouponCar") @Api(description = "停车发券相关接口") public class WxCouponCarController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponCarService wxCouponCarService; - private Logger logger = Logger.getLogger(WxCouponCarController.class); - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java index b8654cbe3..568d0a05a 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -3,7 +3,8 @@ package com.simple.controller; import com.simple.domain.vo.WxCouponChannelVo; import com.simple.enums.EnumCouponChannelStatus; import io.swagger.annotations.Api; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -21,9 +22,8 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("/api/wxCouponChannel") @Api(description = "发券渠道相关接口") -public class WxCouponChannelController extends BaseController -{ - private Logger logger = Logger.getLogger(WxCouponChannelController.class); +public class WxCouponChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index d42da68d7..4e2bd5d04 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -1,30 +1,28 @@ package com.simple.controller; import com.simple.common.ErrorCode; -import com.simple.domain.po.WxCouponChannel; -import com.simple.domain.vo.WxCouponCVo; -import io.swagger.annotations.Api; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.vo.WxCouponCVo; import com.simple.service.WxCouponService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxCoupon") @Api(description = "券类型相关接口") public class WxCouponController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponService wxCouponService; diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 86995705e..d04c4f595 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -1,23 +1,22 @@ package com.simple.controller; -import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; -import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCouponOrder; import com.simple.domain.vo.WxCouponOrderCVo; import com.simple.enums.EnumCouponOrderStatus; -import com.simple.exception.MallinkException; import com.simple.service.WxCouponOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.Map; @@ -26,7 +25,7 @@ import java.util.Map; @RequestMapping("/api/couponOrder") @Api(description = "用户卡券查询接口") public class WxCouponOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderService wxCouponOrderService; @@ -39,7 +38,7 @@ public class WxCouponOrderController extends BaseController { }) public ResultData list(@ModelAttribute WxCouponOrderCVo wxCouponOrder, Integer pageNum, Integer pageSize) { - if(pageNum == null || pageSize == null) { + if (pageNum == null || pageSize == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); @@ -60,7 +59,7 @@ public class WxCouponOrderController extends BaseController { }) public ResultData detail(String couponOrderId) { - if(couponOrderId == null) { + if (couponOrderId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } @@ -74,13 +73,13 @@ public class WxCouponOrderController extends BaseController { }) public ResultData getStatus(String couponOrderId) { - if(couponOrderId == null) { + if (couponOrderId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } Map res = new HashMap(); - res.put("CouponOrderStatus",wxCouponOrderService.getById(Long.valueOf(couponOrderId)).getCouponOrderStatus() ); + res.put("CouponOrderStatus", wxCouponOrderService.getById(Long.valueOf(couponOrderId)).getCouponOrderStatus()); return new ResultData(res); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java index 9e2679de3..c09ce7b34 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java @@ -11,7 +11,8 @@ import com.simple.service.WxMallService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,9 +23,9 @@ import java.util.Map; @RestController @RequestMapping("/api/mall") -@Api(description="商场信息相关接口") +@Api(description = "商场信息相关接口") public class WxMallController extends BaseController { - private Logger logger = Logger.getLogger(WxMallController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMallService wxMallService; @@ -43,7 +44,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } Map resultMap = new HashMap(); @@ -61,7 +62,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } return new ResultData(Result.SUCCESS, "查询成功", mall); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 766ae4d0f..108ad066a 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -9,7 +9,8 @@ import com.simple.service.WxMsgValidationcodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,9 +18,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxMsgValidationcode") -@Api(description="短信验证相关接口") +@Api(description = "短信验证相关接口") public class WxMsgValidationcodeController extends BaseController { - private Logger logger = Logger.getLogger(WxMsgValidationcodeController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; @@ -31,7 +32,6 @@ public class WxMsgValidationcodeController extends BaseController { private WxMerchantService wxMerchantService; - @GetMapping("sendvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java index 7957e3152..4e3311127 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -1,29 +1,27 @@ package com.simple.controller; +import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; +import com.simple.common.Result; +import com.simple.common.ResultData; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.po.WxOrder; import com.simple.domain.vo.WxOrderCVo; import com.simple.enums.EnumCouponChannelStatus; -import com.simple.enums.EnumCouponStatus; import com.simple.enums.EnumOrderStatus; import com.simple.exception.MallinkException; import com.simple.service.WxCouponChannelService; -import io.swagger.annotations.Api; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; - -import com.simple.domain.po.WxOrder; import com.simple.service.WxOrderService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -31,7 +29,7 @@ import java.util.Map; @RequestMapping("/api/order/") @Api(description = "订单相关接口") public class WxOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponChannelService wxCouponChannelService; @@ -181,7 +179,7 @@ public class WxOrderController extends BaseController { @ApiOperation(value = "订单已过期", notes = "{\"orderId\":\"string\"}") @PostMapping("expired") - public ResultData expiredOrder(@RequestBody Map paramMap) { + public ResultData expiredOrder(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); String orderIdStr = paramMap.get("orderId"); @@ -211,8 +209,8 @@ public class WxOrderController extends BaseController { @ApiOperation("分页订单列表接口") @GetMapping("list") @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { // c端用户应该只能看到自己的订单 @@ -226,7 +224,7 @@ public class WxOrderController extends BaseController { @ApiOperation("订单详情接口") @GetMapping("detail") @ApiImplicitParams({ - @ApiImplicitParam(name="orderId",value="订单id",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) }) public ResultData detail(String orderId) { // c端用户应该只能看到自己的订单细节 @@ -240,14 +238,15 @@ public class WxOrderController extends BaseController { } wxOrder.setId(id); wxOrder.setCUserId(getUser().getId()); - WxOrderCVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); + WxOrderCVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); if (wxOrderCVo == null) return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); return new ResultData(wxOrderCVo); } + @ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}") @GetMapping("/findById") - public ResultData findById(@RequestBody Map paramMap) { + public ResultData findById(@RequestBody Map paramMap) { String orderIdStr = paramMap.get("orderId"); if (StringUtils.isBlank(orderIdStr)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java index cb25b896f..f22e2daf9 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java @@ -1,26 +1,25 @@ package com.simple.controller; -import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxPark; -import com.simple.pay.WxPay; import com.simple.service.WxParkService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxPark") @Api(description = "停车相关接口接口") public class WxParkController extends BaseController { - private Logger logger = Logger.getLogger(WxParkController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxParkService wxParkService; diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java index 425817198..6215e02e5 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java @@ -1,51 +1,40 @@ package com.simple.controller; -import cn.binarywang.wx.miniapp.api.WxMaService; -import com.simple.annotation.AuthIgnore; +import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; +import com.simple.common.Result; +import com.simple.common.ResultData; import com.simple.config.PayProperty; import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxCUser; -import com.simple.enums.EnumPayStatus; +import com.simple.domain.po.WxPayOrder; import com.simple.enums.EnumPayWay; -import com.simple.exception.BizMessageException; import com.simple.exception.MallinkException; -import com.simple.pay.WxPayment; +import com.simple.service.WxPayOrderService; import com.simple.utils.IPUtil; import io.swagger.annotations.Api; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; - -import com.simple.domain.po.WxPayOrder; -import com.simple.service.WxPayOrderService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import sun.rmi.runtime.Log; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.nio.charset.Charset; import java.util.Map; @RestController @RequestMapping("/api/pay") @Api(description = "支付相关接口") public class WxPayOrderController extends BaseController { - - private Logger logger = Logger.getLogger(WxPayOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private PayProperty payProperty; - @Autowired + @Autowired private WxPayOrderService wxPayOrderService; @ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") @@ -74,10 +63,10 @@ public class WxPayOrderController extends BaseController { record.setIp(IPUtil.getIpAddr(request)); return wxPayOrderService.createPayOrder(payProperty.isReal(), appInfo, user, record, EnumPayWay.PAY_WAY_WECHAT); } catch (MallinkException e) { - logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); + logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); + logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); } } @@ -86,10 +75,10 @@ public class WxPayOrderController extends BaseController { @PostMapping("/updatePayOrder") public ResultData updatePayOrder(@RequestBody Map paramMap) { logger.info("/api/pay/updatePayOrder" + paramMap.toString()); - String payOrderIdStr = (String)paramMap.get("payOrderId"); - String orderIdStr = (String)paramMap.get("orderId"); - String reasonStr = (String)paramMap.get("reason"); - Integer status = (Integer)paramMap.get("status"); + String payOrderIdStr = (String) paramMap.get("payOrderId"); + String orderIdStr = (String) paramMap.get("orderId"); + String reasonStr = (String) paramMap.get("reason"); + Integer status = (Integer) paramMap.get("status"); if (StringUtils.isBlank(orderIdStr)) { logger.info("orderId不能为空: " + paramMap.toString()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); @@ -97,15 +86,15 @@ public class WxPayOrderController extends BaseController { Long payOrderId = 0L, orderId = 0L; try { orderId = Long.valueOf(orderIdStr); - } catch (NumberFormatException e) { - logger.error("orderId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); + } catch (NumberFormatException e) { + logger.error("orderId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId参数不正确"); } if (!StringUtils.isBlank(payOrderIdStr)) { try { payOrderId = Long.valueOf(payOrderIdStr); } catch (NumberFormatException e) { - logger.error("payOrderId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); + logger.error("payOrderId参数不正确: " + paramMap.toString() + ", e:" + e.getMessage()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId参数不正确"); } } @@ -119,26 +108,26 @@ public class WxPayOrderController extends BaseController { wxPayOrderService.handlePayOrderStatusUpdate(payOrder); return new ResultData(Result.SUCCESS, "支付状态更新成功"); } catch (MallinkException e) { - logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage()); + logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage()); + logger.error("支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage()); + return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage()); } } - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxPayOrder wxPayOrder,Integer pageNum, Integer pageSize) { - if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { + if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("/add") public ResultData add(@RequestBody WxPayOrder wxPayOrder) { //Assert.notNull(wxPayOrder.getName(), "角色名不能为空"); @@ -156,19 +145,18 @@ public class WxPayOrderController extends BaseController { @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxPayOrderService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxPayOrderService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxPayOrderService.getById(id)); } - - - + + } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java index 56794ac8a..bbb87369b 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxScoreHistory; import com.simple.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxScoreHistory") -public class WxScoreHistoryController extends BaseController -{ - @Autowired +public class WxScoreHistoryController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxScoreHistoryService wxScoreHistoryService; - private Logger logger = Logger.getLogger(WxScoreHistoryController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory,Integer pageNum, Integer pageSize) { - if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory, Integer pageNum, Integer pageSize) { + if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxScoreHistoryController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxScoreHistoryService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxScoreHistoryService.getById(id)); } - - - + + } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java index df8405dca..e1be4ca28 100755 --- a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java @@ -46,7 +46,7 @@ import java.util.Map; @RequestMapping("/api/user") @Api(description = "用户登陆授权相关接口") public class WxUserGrantController extends BaseController { - private final static Logger logger = LoggerFactory.getLogger(WxUserGrantController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCUserService wxCUserService; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java index f4d1ef70f..72c9c9ad4 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java @@ -98,8 +98,8 @@ public class WxCUser implements Serializable { /*session key for 微信小程序**/ @io.swagger.annotations.ApiModelProperty(value="session key for 微信小程序",name="sessionKey") private String sessionKey; - /*积分**/ - @io.swagger.annotations.ApiModelProperty(value="积分",name="score") + /*成长值**/ + @io.swagger.annotations.ApiModelProperty(value="成长值",name="score") private Integer score; /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") From 2a563dc6a8a94644357700a84d3f7ef13ca9843e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 10:44:25 +0800 Subject: [PATCH 07/40] =?UTF-8?q?[B=E7=AB=AFlog=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8D=87=E7=BA=A7]:log4j=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxBLogController.java | 54 ++++----- .../simple/controller/WxCouponController.java | 5 +- .../controller/WxCouponOrderController.java | 5 +- .../WxDateAmountRecordController.java | 113 ++++++++---------- .../simple/controller/WxMallController.java | 12 +- .../controller/WxMerchantBUserController.java | 54 ++++----- .../WxMerchantTradeDailyController.java | 36 +++--- .../WxMsgValidationcodeController.java | 5 +- .../controller/WxRefundOrderController.java | 18 +-- 9 files changed, 146 insertions(+), 156 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java index 0a7a298cd..172cb109d 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java @@ -1,43 +1,40 @@ package com.simple.controller; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBLog") -@Api(description="B端埋点相关接口") -public class WxBLogController extends BaseController -{ - @Autowired +@Api(description = "B端埋点相关接口") +public class WxBLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxBLogService wxBLogService; - private Logger logger = Logger.getLogger(WxBLogController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBLog wxBLog,Integer pageNum, Integer pageSize) { - if (null == wxBLog) wxBLog = new WxBLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxBLog wxBLog, Integer pageNum, Integer pageSize) { + if (null == wxBLog) wxBLog = new WxBLog(); final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBLog wxBLog) { //Assert.notNull(wxBLog.getName(), "角色名不能为空"); @@ -55,19 +52,18 @@ public class WxBLogController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBLogService.getById(id)); } - - - + + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index eb28665e8..fd3dd0dde 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -6,7 +6,8 @@ import com.simple.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/coupon") @Api(description="券类相关接口") public class WxCouponController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponService wxCouponService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 3f855ff79..22ae3324a 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -13,7 +13,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,7 +24,7 @@ import java.util.Map; @RequestMapping("/api/couponOrder") @Api(description = "卡券相关接口") public class WxCouponOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderService wxCouponOrderService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index bb87f0fdf..817b177da 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -1,78 +1,71 @@ package com.simple.controller; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; -import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxDateAmountRecord; import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.vo.AmountRecordVo; import com.simple.service.WxDateAmountRecordService; - import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; @RestController @RequestMapping("/api/wxDateAmountRecord") -@Api(description="首页交易记录相关接口") -public class WxDateAmountRecordController extends BaseController -{ - @Autowired - private WxDateAmountRecordService wxDateAmountRecordService; +@Api(description = "首页交易记录相关接口") +public class WxDateAmountRecordController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxDateAmountRecordController.class); + @Autowired + private WxDateAmountRecordService wxDateAmountRecordService; - @ApiOperation("首页查询交易金额记录接口") + @ApiOperation("首页查询交易金额记录接口") @GetMapping("listOrder") - public ResultData listOrder() { - return list(0); - } - - @ApiOperation("首页查询核销金额记录接口") - @GetMapping("listVerified") - public ResultData listVerified() { - return list(1); - } - - private ResultData list(int verified) { - - List list =new ArrayList<>(); - - WxDateAmountRecord temp = new WxDateAmountRecord(); - WxMerchantBUser u = getUser(); - temp.setTenantId(u.getTenantId()); - temp.setMerchantId(u.getMerchantId()); - temp.setType(verified); - temp.setSortColumns(WxDateAmountRecord.Field.UpdateDate_ASC); - - SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); - - PageInfo page = wxDateAmountRecordService.listAsPage(temp, 1, 7); - if(page.getSize()>0) { - - for (WxDateAmountRecord wxDateAmountRecord:page.getList()) { - - AmountRecordVo vo = new AmountRecordVo(); - vo.setAmount(wxDateAmountRecord.getPayPrice()); - vo.setAmountDetail(wxDateAmountRecord); - vo.setMouthAndDate(fmt.format(wxDateAmountRecord.getUpdateDate())); - list.add(vo); - } - } - return new ResultData(list); - } + public ResultData listOrder() { + return list(0); + } + + @ApiOperation("首页查询核销金额记录接口") + @GetMapping("listVerified") + public ResultData listVerified() { + return list(1); + } + + private ResultData list(int verified) { + + List list = new ArrayList<>(); + + WxDateAmountRecord temp = new WxDateAmountRecord(); + WxMerchantBUser u = getUser(); + temp.setTenantId(u.getTenantId()); + temp.setMerchantId(u.getMerchantId()); + temp.setType(verified); + temp.setSortColumns(WxDateAmountRecord.Field.UpdateDate_ASC); + + SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); + + PageInfo page = wxDateAmountRecordService.listAsPage(temp, 1, 7); + if (page.getSize() > 0) { + + for (WxDateAmountRecord wxDateAmountRecord : page.getList()) { + + AmountRecordVo vo = new AmountRecordVo(); + vo.setAmount(wxDateAmountRecord.getPayPrice()); + vo.setAmountDetail(wxDateAmountRecord); + vo.setMouthAndDate(fmt.format(wxDateAmountRecord.getUpdateDate())); + list.add(vo); + } + } + return new ResultData(list); + } } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java index f234eef23..c09ce7b34 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java @@ -6,13 +6,13 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxMall; -import com.simple.mapper.WxAppinfoMapper; import com.simple.service.WxAppinfoService; import com.simple.service.WxMallService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,9 +23,9 @@ import java.util.Map; @RestController @RequestMapping("/api/mall") -@Api(description="商场信息相关接口") +@Api(description = "商场信息相关接口") public class WxMallController extends BaseController { - private Logger logger = Logger.getLogger(WxMallController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMallService wxMallService; @@ -44,7 +44,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } Map resultMap = new HashMap(); @@ -62,7 +62,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } return new ResultData(Result.SUCCESS, "查询成功", mall); diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index 8301d4fba..90d300f01 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -3,7 +3,6 @@ package com.simple.controller; import com.simple.annotation.AuthIgnore; import com.simple.common.ErrorCode; -import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxMall; import com.simple.domain.po.WxMerchant; @@ -16,7 +15,8 @@ import com.simple.utils.IPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -28,13 +28,12 @@ import java.util.HashMap; import java.util.Map; @RestController -@Api(description="B端用户相关接口") +@Api(description = "B端用户相关接口") @RequestMapping("/api/user") -public class WxMerchantBUserController extends BaseController -{ - private Logger logger = Logger.getLogger(WxMerchantBUserController.class); +public class WxMerchantBUserController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired + @Autowired private WxMerchantBUserService wxMerchantBUserService; @Autowired @@ -51,36 +50,37 @@ public class WxMerchantBUserController extends BaseController WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); - if (user==null) + if (user == null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); - if (mall==null) + if (mall == null) return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); - resultMap.put("phone",user.getPhone()); - resultMap.put("name",user.getName()); - resultMap.put("merchant_name",merchant.getName()); - resultMap.put("merchant_img_url",merchant.getImgUrl()); - resultMap.put("mall_name",mall.getName()); - resultMap.put("service_phone",mall.getServicePhone()); + resultMap.put("phone", user.getPhone()); + resultMap.put("name", user.getName()); + resultMap.put("merchant_name", merchant.getName()); + resultMap.put("merchant_img_url", merchant.getImgUrl()); + resultMap.put("mall_name", mall.getName()); + resultMap.put("service_phone", mall.getServicePhone()); return new ResultData(resultMap); } /** * 用户登录 + * * @param map * @return */ @AuthIgnore @PostMapping("/login") - @ApiOperation(value="用户登录", notes="{" + + @ApiOperation(value = "用户登录", notes = "{" + "\"appId\":\"string\"," + "\"phone\":\"string\",\"password\":\"string\"," + "\"latitude\":\"string\",\"longitude\":\"string\"}") @@ -103,9 +103,9 @@ public class WxMerchantBUserController extends BaseController } String token = null; - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); - if (!StringUtils.isBlank(latitude)&&!StringUtils.isBlank(longitude)) { + if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) { //return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "经纬度未获取"); logger.info("B端用户: " + phone + " 登录 IP" + ipaddress + ", 经纬度(" + longitude + "," + latitude + ")"); } @@ -131,15 +131,15 @@ public class WxMerchantBUserController extends BaseController try { merchant = wxMerchantService.getById(user1.getMerchantId()); } catch (Exception e) { - logger.error(ErrorCode.DB_FAIL.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.DB_FAIL.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.DB_FAIL); } if (merchant == null) { - logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) { - logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); } // check password @@ -169,12 +169,12 @@ public class WxMerchantBUserController extends BaseController @AuthIgnore @ApiOperation(value = "修改密码", notes = "{\"appId\",\"string\", \"phone\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}") @PostMapping("/updatepwd") - public ResultData updatepwd(@RequestBody Map params) { + public ResultData updatepwd(@RequestBody Map params) { // String phone,String code,String pwd String appId = params.get("appId"); - String phone=params.get("phone"); - String code=params.get("code"); - String pwd=params.get("pwd"); + String phone = params.get("phone"); + String code = params.get("code"); + String pwd = params.get("pwd"); if (StringUtils.isBlank(appId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "appId不能为空"); } @@ -190,5 +190,5 @@ public class WxMerchantBUserController extends BaseController return wxMerchantBUserService.updatepwd(appId, phone, code, pwd); } - + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index 2efde81d3..9184a1c1e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -1,30 +1,25 @@ package com.simple.controller; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; import com.simple.common.ResultData; - -import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.service.WxMerchantTradeDailyService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxMerchantTradeDaily") @Api(description = "解单相关接口") -public class WxMerchantTradeDailyController extends BaseController -{ - @Autowired - private WxMerchantTradeDailyService wxMerchantTradeDailyService; +public class WxMerchantTradeDailyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); + @Autowired + private WxMerchantTradeDailyService wxMerchantTradeDailyService; @ApiOperation("获得当日解单") @@ -41,11 +36,10 @@ public class WxMerchantTradeDailyController extends BaseController @ApiOperation("上报每日解单") @GetMapping("/reportDailyVolume") - @ApiImplicitParam(name="volume",value="总金额（分）",dataType="Integer", paramType = "query",required=true) + @ApiImplicitParam(name = "volume", value = "总金额（分）", dataType = "Integer", paramType = "query", required = true) public ResultData saveDailyTradingVolume(Integer volume) { - return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(),volume); + return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(), volume); } - - - + + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 5cc042ca9..fe1e68b3e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -11,7 +11,8 @@ import com.simple.service.WxMsgValidationcodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("wxMsgValidationcode") @Api(description="短信验证相关接口") public class WxMsgValidationcodeController extends BaseController { - private Logger logger = Logger.getLogger(WxMsgValidationcodeController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java index 22481f9a1..0528c0bb5 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -5,18 +5,22 @@ import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.config.PayProperty; -import com.simple.domain.po.*; -import com.simple.enums.EnumPayStatus; -import com.simple.enums.EnumPayWay; +import com.simple.domain.po.WxAppinfo; +import com.simple.domain.po.WxMerchantBUser; +import com.simple.domain.po.WxRefundOrder; import com.simple.enums.EnumRefundWay; import com.simple.exception.MallinkException; -import com.simple.service.*; +import com.simple.service.WxCouponOrderService; +import com.simple.service.WxOrderService; +import com.simple.service.WxPayOrderService; +import com.simple.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,9 +28,9 @@ import java.util.Map; @RestController @RequestMapping("/api/refund") -@Api(description="退款相关接口") +@Api(description = "退款相关接口") public class WxRefundOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxRefundOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private PayProperty payProperty; From 96ca58b67fa7cd78a4fb55b4219ab18271684a80 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 11:02:54 +0800 Subject: [PATCH 08/40] =?UTF-8?q?[Admin=E7=AB=AFlog=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8D=87=E7=BA=A7]:log4j=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CouponInjectController.java | 50 +- .../controller/DataTowerController.java | 12 +- .../com/simple/controller/HomeController.java | 85 ++-- .../controller/MallPermissionController.java | 22 +- .../simple/controller/MallRoleController.java | 105 ++-- .../controller/MallUserInfoController.java | 143 +++--- .../MarkingDataReportController.java | 21 +- .../controller/PushLimitController.java | 52 +- .../simple/controller/UploadController.java | 136 +++--- .../controller/WxAdminLogController.java | 52 +- .../controller/WxAppinfoController.java | 50 +- .../simple/controller/WxBLogController.java | 50 +- .../controller/WxBillRentController.java | 45 +- .../controller/WxBusinessController.java | 50 +- .../simple/controller/WxCLogController.java | 10 +- .../WxCUserBasicInfoController.java | 9 +- .../controller/WxCUserCarController.java | 50 +- .../simple/controller/WxCUserController.java | 10 +- .../controller/WxCUserDataController.java | 5 +- .../controller/WxCUserTagsController.java | 50 +- .../controller/WxCampaignController.java | 93 ++-- .../controller/WxCarCallBackController.java | 186 +++---- .../controller/WxCarCmdLogController.java | 49 +- .../simple/controller/WxCarController.java | 44 +- .../controller/WxChannelController.java | 50 +- .../WxCouponActionLogController.java | 50 +- .../controller/WxCouponCarController.java | 50 +- .../controller/WxCouponChannelController.java | 90 ++-- .../simple/controller/WxCouponController.java | 142 +++--- .../controller/WxCouponOrderController.java | 29 +- .../controller/WxCouponSendController.java | 73 ++- .../controller/WxCouponSpreadController.java | 68 ++- .../controller/WxCouponTypeController.java | 53 +- .../simple/controller/WxGroupController.java | 37 +- .../controller/WxLevelConfigController.java | 10 +- .../controller/WxMallApplyController.java | 36 +- .../controller/WxMallBuildingController.java | 10 +- .../controller/WxMallConfigController.java | 93 ++-- .../simple/controller/WxMallController.java | 10 +- .../controller/WxMallFloorController.java | 10 +- .../controller/WxMerchantBUserController.java | 10 +- .../controller/WxMerchantController.java | 7 +- .../controller/WxMerchantShopController.java | 49 +- .../WxMerchantTradeDailyController.java | 50 +- .../controller/WxMsgCallbackController.java | 54 +-- .../controller/WxMsgConfigController.java | 50 +- .../simple/controller/WxMsgController.java | 56 +-- .../controller/WxMsgModelController.java | 45 +- .../controller/WxMsgSignatureController.java | 39 +- .../WxMsgValidationcodeController.java | 10 +- .../WxMsgValidationcodeModelController.java | 37 +- .../simple/controller/WxOrderController.java | 8 +- .../simple/controller/WxParkController.java | 50 +- .../controller/WxPayAccountController.java | 10 +- .../simple/controller/WxPayController.java | 5 +- .../controller/WxPayOrderController.java | 8 +- .../WxProfitSharingReceiverController.java | 7 +- .../controller/WxRefundOrderController.java | 7 +- .../controller/WxRentContractController.java | 10 +- .../controller/WxScoreHistoryController.java | 50 +- .../controller/WxScoreRulesController.java | 57 +-- .../WxScoreValidityPeriodController.java | 50 +- .../simple/controller/WxShopController.java | 53 +- .../simple/controller/WxTagsController.java | 10 +- .../controller/WxUserChannelController.java | 49 +- .../controller/WxUserCouponController.java | 3 + .../controller/WxUserStructureController.java | 452 +++++++++--------- 67 files changed, 1639 insertions(+), 1787 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java index 1f4b43272..0e6da25a4 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java @@ -11,8 +11,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,36 +23,35 @@ import java.util.List; @Api(description = "精准投放接口") @RestController @RequestMapping("couponInject") -public class CouponInjectController extends BaseController -{ - @Autowired +public class CouponInjectController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private CouponInjectService couponInjectService; - @Autowired + @Autowired private WxCUserTagsService wxCUserTagsService; - private Logger logger = Logger.getLogger(CouponInjectController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute CouponInject couponInject, Integer pageNum, Integer pageSize) { - if (null == couponInject) couponInject = new CouponInject(); - if(couponInject.getStatus()!=null&&couponInject.getStatus()==-1){ + if (null == couponInject) couponInject = new CouponInject(); + if (couponInject.getStatus() != null && couponInject.getStatus() == -1) { couponInject.setStatus(null); } final PageInfo page = couponInjectService.listAsPage(couponInject, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody CouponInject couponInject) { couponInject.setTenantId(getUser().getTenantId()); couponInject.setMUserId(getUser().getId()); - if(couponInject.getSendType()==0){ + if (couponInject.getSendType() == 0) { couponInject.setSendTime(new Date()); } //Assert.notNull(couponInject.getName(), "角色名不能为空"); @@ -75,25 +74,24 @@ public class CouponInjectController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { couponInjectService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { CouponInject couponInject = couponInjectService.getById(id); - if(couponInject!=null) { + if (couponInject != null) { List tagids = JSON.parseArray(couponInject.getTags(), Long.class); couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(tagids)); } - return new ResultData(Result.SUCCESS,"查询成功",couponInject); + return new ResultData(Result.SUCCESS, "查询成功", couponInject); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java index 3ed0a4e0e..2707a4a66 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -4,7 +4,8 @@ import com.simple.common.ResultData; import com.simple.service.DataTowerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,8 +18,7 @@ import java.util.Map; @RequestMapping("datatower") public class DataTowerController extends BaseController { - - private Logger logger = Logger.getLogger(DataTowerController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private DataTowerService dataTowerService; @@ -28,7 +28,7 @@ public class DataTowerController extends BaseController { @PostMapping("/queryRunning") public ResultData queryRunning() { - Map data=dataTowerService.queryRunning(getTenantId()); + Map data = dataTowerService.queryRunning(getTenantId()); return new ResultData(data); } @@ -38,7 +38,7 @@ public class DataTowerController extends BaseController { @PostMapping("/queryCar") public ResultData queryCar() { - Map data=dataTowerService.queryCar(getTenantId()); + Map data = dataTowerService.queryCar(getTenantId()); return new ResultData(data); } @@ -47,7 +47,7 @@ public class DataTowerController extends BaseController { @PostMapping("/queryCustomer") public ResultData queryCustomer() { - Map data=dataTowerService.queryCustomer(getTenantId()); + Map data = dataTowerService.queryCustomer(getTenantId()); return new ResultData(data); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 5639ede1e..d737fa627 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -1,15 +1,5 @@ package com.simple.controller; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.subject.Subject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; import com.simple.domain.po.MallRolePermission; @@ -18,44 +8,44 @@ import com.simple.domain.po.MallUserRole; import com.simple.service.MallRolePermissionService; import com.simple.service.MallUserRoleService; import com.simple.shiro.UserSession; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.subject.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; @RestController -@Api(description="登录相关接口") +@Api(description = "登录相关接口") public class HomeController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); -// @Autowired -// private MallRoleService sysRoleService; -// -// @Autowired -// private MallPermissionService sysPermissionService; - @Autowired private MallUserRoleService mallUserRoleService; - + @Autowired private MallRolePermissionService mallRolePermissionService; -// @GetMapping("login") -// public ResultData login() { -// return new ResultData(Result.UNLOGIN, "用户未登录"); -// } - @ApiOperation("登录") @PostMapping("/doLogin") public ResultData login(@RequestBody MallUserInfo user) { - ResultData data = new ResultData(); + ResultData data = new ResultData(); if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) { // throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); - return new ResultData(ResultData.ERROR,"用户名或者密码错误"); + return new ResultData(ResultData.ERROR, "用户名或者密码错误"); } try { - Subject subject = SecurityUtils.getSubject(); - UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); - subject.login(token); + Subject subject = SecurityUtils.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); + subject.login(token); // List roleList = sysRoleService.findRoleByUserId(user.getId()); // if (null != roleList && roleList.size() > 0) { // List permissionList = sysPermissionService @@ -63,33 +53,34 @@ public class HomeController { // user.setRole(roleList); // user.setPermission(permissionList); // } - MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); MallUserRole ur = new MallUserRole(); ur.setUid(info.getId()); PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); - if(page.getSize()>0) { - Long roleId = page.getList().get(0).getRoleId(); - MallRolePermission p = new MallRolePermission(); - p.setRoleId(roleId); - p.setTenantId(info.getTenantId()); - PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); - String menus = ""; - for(MallRolePermission rp :listAsPage.getList()) { - menus+=rp.getPermissionId()+","; - } - if(menus.length()>0) { - menus = menus.substring(0, menus.length()-1); - } - info.setMenus(menus); + if (page.getSize() > 0) { + Long roleId = page.getList().get(0).getRoleId(); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(roleId); + p.setTenantId(info.getTenantId()); + PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); + String menus = ""; + for (MallRolePermission rp : listAsPage.getList()) { + menus += rp.getPermissionId() + ","; + } + if (menus.length() > 0) { + menus = menus.substring(0, menus.length() - 1); + } + info.setMenus(menus); } - data.data=info; - }catch(Exception e) { - return new ResultData(ResultData.ERROR,"用户名或者密码错误"); + data.data = info; + } catch (Exception e) { + return new ResultData(ResultData.ERROR, "用户名或者密码错误"); } return data; } + @ApiOperation("登出") @GetMapping("/logout") public ResultData login() { diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java index 858e0c21a..7b294eaea 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java @@ -1,18 +1,19 @@ package com.simple.controller; +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.MallPermission; +import com.simple.service.MallPermissionService; import org.apache.shiro.util.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; -import com.simple.domain.po.MallPermission; -import com.simple.service.MallPermissionService; - /** * @author chenkx * @date 2018-01-05. @@ -20,16 +21,17 @@ import com.simple.service.MallPermissionService; @RestController @RequestMapping("permission") public class MallPermissionController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired MallPermissionService mallPermissionService; - + @GetMapping("alllist") public ResultData alllist(String ava) { MallPermission record = new MallPermission(); - record.setAvailable(ava); - PageInfo permissions= mallPermissionService.listAsPage(record, 1, 10000); + record.setAvailable(ava); + PageInfo permissions = mallPermissionService.listAsPage(record, 1, 10000); return new ResultData(Result.SUCCESS, "查询成功", permissions.getList()); } @@ -51,7 +53,7 @@ public class MallPermissionController { mallPermissionService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - + @GetMapping("/findById") public ResultData findById(Long id) { mallPermissionService.getById(id); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index 6cf72708e..5d756da59 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -1,18 +1,5 @@ package com.simple.controller; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; @@ -20,16 +7,24 @@ import com.simple.domain.po.MallRole; import com.simple.domain.po.MallRolePermission; import com.simple.service.MallRolePermissionService; import com.simple.service.MallRoleService; - import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; @RestController @RequestMapping("role") -@Api(description="角色相关接口") +@Api(description = "角色相关接口") public class MallRoleController extends BaseController { - private Logger logger = Logger.getLogger(MallRoleController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private MallRoleService sysRoleService; @@ -39,47 +34,48 @@ public class MallRoleController extends BaseController { @GetMapping("list") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { - String tenantId = getTenantId(); - sysRole.setTenantId(tenantId); + String tenantId = getTenantId(); + sysRole.setTenantId(tenantId); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); - for(MallRole r:page.getList()) { - MallRolePermission p = new MallRolePermission(); - p.setRoleId(r.getId()); - p.setTenantId(tenantId); - PageInfo pers = sysRolePermissionService.listAsPage(p, 1, 1000); - String menus =""; - for(MallRolePermission rp:pers.getList()) { - menus+=rp.getPermissionId()+","; - } - if(menus.length()>1) { - menus=menus.substring(0, menus.length()-1); - } - r.setMenus(menus); + for (MallRole r : page.getList()) { + MallRolePermission p = new MallRolePermission(); + p.setRoleId(r.getId()); + p.setTenantId(tenantId); + PageInfo pers = sysRolePermissionService.listAsPage(p, 1, 1000); + String menus = ""; + for (MallRolePermission rp : pers.getList()) { + menus += rp.getPermissionId() + ","; + } + if (menus.length() > 1) { + menus = menus.substring(0, menus.length() - 1); + } + r.setMenus(menus); } return new ResultData(page); } - - + + @PostMapping("saveOrUpdate") - public ResultData saveOrUpdate(@RequestBody MallRole sysRole ) { - String tenantId = getTenantId(); - int count = sysRoleService.countByName(sysRole.getName(), sysRole.getId()); - if(count>0) { - return new ResultData(ResultData.ERROR,"角色名已存在"); - } - sysRole.setTenantId(tenantId); - sysRoleService.saveOrUpdate(sysRole); + public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { + String tenantId = getTenantId(); + int count = sysRoleService.countByName(sysRole.getName(), sysRole.getId()); + if (count > 0) { + return new ResultData(ResultData.ERROR, "角色名已存在"); + } + sysRole.setTenantId(tenantId); + sysRoleService.saveOrUpdate(sysRole); // SysRolePermissionService.deleteById(id); - if(StringUtils.isNoneBlank(sysRole.getMenus())) { - List mIds =new ArrayList<>(); - for(String mId:sysRole.getMenus().split(",")) { - mIds.add(Long.valueOf(mId)); - } - sysRolePermissionService.savePermissions(tenantId,sysRole.getId(), mIds.toArray(new Long[] {}));; - } - return new ResultData(); + if (StringUtils.isNoneBlank(sysRole.getMenus())) { + List mIds = new ArrayList<>(); + for (String mId : sysRole.getMenus().split(",")) { + mIds.add(Long.valueOf(mId)); + } + sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); + ; + } + return new ResultData(); } - + @PostMapping("add") public ResultData add(MallRole sysRole) { @@ -92,15 +88,14 @@ public class MallRoleController extends BaseController { @PostMapping("update") public ResultData update(MallRole sysRole) { if (sysRole.getName() != null) { - System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); + System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在"); } sysRoleService.saveOrUpdate(sysRole); // Assert.notNull(sysRole.getName(), "角色名不能为空"); return new ResultData(); } - - + @PostMapping("/del") public ResultData delete(@RequestBody MallRole sysRole) { @@ -111,10 +106,10 @@ public class MallRoleController extends BaseController { @GetMapping("setPermission") public ResultData setPermission(Long roleId, String perId) { - Assert.notNull(perId,"请选择权限"); + Assert.notNull(perId, "请选择权限"); /*String[] perIds = perId.split(","); SysRolePermissionService.savePermissions(roleId, perIds);*/ - //TODO + //TODO return new ResultData(Result.SUCCESS, "设置角色权限成功", null); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index f330dbccc..25952ef1a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -1,26 +1,22 @@ package com.simple.controller; -import java.util.HashMap; -import java.util.Map; - -import com.simple.domain.po.*; -import com.simple.service.*; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; +import com.simple.domain.po.*; +import com.simple.service.*; import com.simple.shiro.PasswordHelper; import com.simple.shiro.UserSession; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.SecurityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; /** * @author chenkx @@ -31,15 +27,17 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("user") public class MallUserInfoController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired MallUserInfoService userInfoService; @Autowired MallUserRoleService userRoleService; - + @Autowired MallRoleService mallRoleService; - + @Autowired MallUserRoleService mallUserRoleService; @@ -51,35 +49,35 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户分页接口", response = String.class) @GetMapping("lists") - public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize){ + public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { userInfo.setTenantId(getTenantId()); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); - for(MallUserInfo u:page.getList()) { - MallUserRole r =new MallUserRole(); - r.setUid(u.getId()); - PageInfo ur = userRoleService.listAsPage(r, 1, 1); - if(ur.getSize()>0) { - MallRole role = mallRoleService.getById(ur.getList().get(0).getRoleId()); - if (role != null) { + for (MallUserInfo u : page.getList()) { + MallUserRole r = new MallUserRole(); + r.setUid(u.getId()); + PageInfo ur = userRoleService.listAsPage(r, 1, 1); + if (ur.getSize() > 0) { + MallRole role = mallRoleService.getById(ur.getList().get(0).getRoleId()); + if (role != null) { u.setRoleName(role.getName()); u.setRoleId(role.getId()); } - } - u.setPassword(null);//不返回密码 + } + u.setPassword(null);//不返回密码 } return new ResultData(page); } @ApiOperation(value = "用户详情接口", response = String.class) @GetMapping("detail") - public ResultData detail(Long id){ + public ResultData detail(Long id) { final MallUserInfo user = userInfoService.getById(id); return new ResultData(user); } @ApiOperation(value = "创建用户接口", response = String.class) @PostMapping("add") - public ResultData createUser(@RequestBody MallUserInfo userInfo){ + public ResultData createUser(@RequestBody MallUserInfo userInfo) { Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名"); Assert.notNull(userInfo.getPassword(), "密码不能为空"); @@ -87,18 +85,18 @@ public class MallUserInfoController extends BaseController { passwordHelper.encryptPassword(userInfo); userInfo.setTenantId(getTenantId()); userInfoService.saveOrUpdate(userInfo); - if(userInfo.getRoleId()!=null) { - MallUserRole r = new MallUserRole(); - r.setRoleId(userInfo.getRoleId()); - r.setUid(userInfo.getId()); - userRoleService.saveOrUpdate(r); + if (userInfo.getRoleId() != null) { + MallUserRole r = new MallUserRole(); + r.setRoleId(userInfo.getRoleId()); + r.setUid(userInfo.getId()); + userRoleService.saveOrUpdate(r); } return new ResultData(); } @ApiOperation(value = "修改用户接口", response = String.class) @PostMapping("update") - public ResultData updateUser(@RequestBody MallUserInfo userInfo){ + public ResultData updateUser(@RequestBody MallUserInfo userInfo) { Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); // Assert.notNull(userInfo.getPassword(), "密码不能为空"); @@ -107,12 +105,12 @@ public class MallUserInfoController extends BaseController { userInfo.setPassword(null); userInfo.setTenantId(getTenantId()); userInfoService.saveOrUpdate(userInfo); - if(userInfo.getRoleId()!=null) { - userRoleService.deleteByUserId(userInfo.getId()); - MallUserRole r = new MallUserRole(); - r.setRoleId(userInfo.getRoleId()); - r.setUid(userInfo.getId()); - userRoleService.saveOrUpdate(r); + if (userInfo.getRoleId() != null) { + userRoleService.deleteByUserId(userInfo.getId()); + MallUserRole r = new MallUserRole(); + r.setRoleId(userInfo.getRoleId()); + r.setUid(userInfo.getId()); + userRoleService.saveOrUpdate(r); } return new ResultData(); } @@ -121,12 +119,13 @@ public class MallUserInfoController extends BaseController { @PostMapping("/del") public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { userInfoService.deleteById(userInfo.getId()); - + return new ResultData(); } /** * 启用，停用用户 + * * @param userId * @param status * @return @@ -143,7 +142,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户添加角色接口", response = String.class) @PostMapping("setRoles") - public ResultData setRoles(Long userId,String roleIds) { + public ResultData setRoles(Long userId, String roleIds) { /*String[] roIds = roleIds.split(","); List u2rs = new ArrayList<>(roIds.length); for (String roleId : roIds) { @@ -169,40 +168,40 @@ public class MallUserInfoController extends BaseController { } return true; } - - + + @GetMapping("hasButtonPermission") - public ResultData hasButtonPermission(String permissions){ - Map map=new HashMap<>(); - for(String name:permissions.split(",")){ - Long userId = (Long) - SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); - boolean has =userInfoService.hasButtonPermission(userId, name); - map.put(name, has); - } + public ResultData hasButtonPermission(String permissions) { + Map map = new HashMap<>(); + for (String name : permissions.split(",")) { + Long userId = (Long) + SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); + boolean has = userInfoService.hasButtonPermission(userId, name); + map.put(name, has); + } // StringBuffer buffer = new StringBuffer(); // for(Entry entrySet :map.entrySet()){ // buffer.append("var "+entrySet.getKey()); // buffer.append("="+entrySet.getValue()); // buffer.append(";"); // } - //return new ResultData(buffer.toString()); - return new ResultData(map); + //return new ResultData(buffer.toString()); + return new ResultData(map); } - + @GetMapping("getUser") - public ResultData getUserInfo(){ - MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - if (info.getIsAdmin() == 1) { // isAdmin - MallPermission q = new MallPermission(); - PageInfo list = mallPermissionService.listAsPage(q,1,100); + public ResultData getUserInfo() { + MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + info.setPassword("保密"); + if (info.getIsAdmin() == 1) { // isAdmin + MallPermission q = new MallPermission(); + PageInfo list = mallPermissionService.listAsPage(q, 1, 100); String menus = ""; - for(MallPermission rp :list.getList()) { - menus+=rp.getId()+","; + for (MallPermission rp : list.getList()) { + menus += rp.getId() + ","; } - if(menus.length()>0) { - menus = menus.substring(0, menus.length()-1); + if (menus.length() > 0) { + menus = menus.substring(0, menus.length() - 1); } info.setMenus(menus); } else { @@ -210,22 +209,22 @@ public class MallUserInfoController extends BaseController { MallUserRole ur = new MallUserRole(); ur.setUid(info.getId()); PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); - if(page.getSize()>0) { + if (page.getSize() > 0) { Long roleId = page.getList().get(0).getRoleId(); MallRolePermission p = new MallRolePermission(); p.setRoleId(roleId); p.setTenantId(info.getTenantId()); PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); String menus = ""; - for(MallRolePermission rp :listAsPage.getList()) { - menus+=rp.getPermissionId()+","; + for (MallRolePermission rp : listAsPage.getList()) { + menus += rp.getPermissionId() + ","; } - if(menus.length()>0) { - menus = menus.substring(0, menus.length()-1); + if (menus.length() > 0) { + menus = menus.substring(0, menus.length() - 1); } info.setMenus(menus); } } - return new ResultData(info); + return new ResultData(info); } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/simple/controller/MarkingDataReportController.java index a19a432cb..5232ddd81 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MarkingDataReportController.java @@ -1,12 +1,12 @@ package com.simple.controller; -import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.dto.MarkingCouponDataReportDto; import com.simple.service.MarkingDataReportService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -18,11 +18,13 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("markingDataReport") -@Api(description="营销报表接口") +@Api(description = "营销报表接口") public class MarkingDataReportController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private MarkingDataReportService markingDataReportService; + @ApiOperation("查询券数据") @GetMapping("/couponData") public ResultData findCouponData() { @@ -31,8 +33,8 @@ public class MarkingDataReportController extends BaseController { @ApiOperation("查询券数据列表") @GetMapping("/couponDataList") - public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto,Integer pageNum, Integer pageSize) { - return new ResultData(markingDataReportService.getCouponDateList(getTenantId(),markingCouponDataReportDto,pageNum,pageSize)); + public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + return new ResultData(markingDataReportService.getCouponDateList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询场景投放券数据") @@ -43,8 +45,8 @@ public class MarkingDataReportController extends BaseController { @ApiOperation("查询场景营销数据列表") @GetMapping("/sceneDataList") - public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto,Integer pageNum, Integer pageSize) { - return new ResultData(markingDataReportService.getSceneDataList(getTenantId(),markingCouponDataReportDto,pageNum,pageSize)); + public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + return new ResultData(markingDataReportService.getSceneDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询触达用户数数据") @@ -55,10 +57,9 @@ public class MarkingDataReportController extends BaseController { @ApiOperation("查询触达用户数数据列表") @GetMapping("/touchUsersDataList") - public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto,Integer pageNum, Integer pageSize) { - return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantId(),markingCouponDataReportDto,pageNum,pageSize)); + public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } - } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/PushLimitController.java b/mallinkAdmin/src/main/java/com/simple/controller/PushLimitController.java index d784dda15..df1f5e624 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/PushLimitController.java @@ -1,69 +1,59 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.PushLimit; import com.simple.service.PushLimitService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("pushLimit") -@Api(description="疲劳度相关接口") -public class PushLimitController extends BaseController -{ - @Autowired +@Api(description = "疲劳度相关接口") +public class PushLimitController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private PushLimitService pushLimitService; - private Logger logger = Logger.getLogger(PushLimitController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") public ResultData list(@ModelAttribute PushLimit pushLimit) { - if (null == pushLimit) pushLimit = new PushLimit(); - pushLimit.setTenantId(getTenantId()); + if (null == pushLimit) pushLimit = new PushLimit(); + pushLimit.setTenantId(getTenantId()); final PageInfo page = pushLimitService.listAsPage(pushLimit, 1, 10); return new ResultData(page); } - @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody PushLimit pushLimit) { - pushLimit.setMsgAmount(null); + pushLimit.setMsgAmount(null); pushLimitService.saveOrUpdate(pushLimit); return new ResultData(); } @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { pushLimitService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",pushLimitService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", pushLimitService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index f8db9e2b1..9b9183390 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -1,15 +1,9 @@ package com.simple.controller; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - +import com.simple.common.ResultData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -19,84 +13,86 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.simple.common.ResultData; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; @RestController @RequestMapping(value = "upload") -@Api(description="文件上传接口") +@Api(description = "文件上传接口") public class UploadController { - private final Logger logger = LoggerFactory.getLogger(UploadController.class); - + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Value("${fileUpload.path}") private String filePath; - + @Value("${fileUpload.server}") private String server; /** * 上传文件 * - * @param request + * @param multiReq * @return * @throws Exception */ - @PostMapping(value = "/fileUpload", consumes="multipart/*" - ,headers="content-type=multipart/form-data" ) + @PostMapping(value = "/fileUpload", consumes = "multipart/*" + , headers = "content-type=multipart/form-data") @ApiOperation("上传文件") - public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq - ) { - ResultData data = new ResultData(); - FileOutputStream fos=null; - BufferedInputStream fs=null; - try { - File targetFile = new File(filePath); - if(!targetFile.exists()){ - targetFile.mkdirs(); - } - String fileName = UUID.randomUUID().toString(); - int dot = multiReq.getOriginalFilename().lastIndexOf('.'); - fileName=fileName+ multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fos = new FileOutputStream(new File(filePath+File.separator+fileName)); - fs=(BufferedInputStream) multiReq.getInputStream(); - byte[] buffer=new byte[1024]; - int len=0; - while((len=fs.read(buffer))!=-1){ - fos.write(buffer, 0, len); - } - fos.close(); - fs.close(); - data.code=ResultData.SUCCESS; - Map map = new HashMap<>(); - map.put("imgarray", server+"/"+fileName); - data.data=map; - } catch (Exception e) { - e.printStackTrace(); - data.code=ResultData.ERROR; - data.message="上传失败"; - }finally { - if(fos!=null) { - try { - fos.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if(fs!=null) { - try { - fs.close(); - }catch(IOException e) { - e.printStackTrace(); - } - } - - - } + public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq) { + ResultData data = new ResultData(); + FileOutputStream fos = null; + BufferedInputStream fs = null; + try { + File targetFile = new File(filePath); + if (!targetFile.exists()) { + targetFile.mkdirs(); + } + String fileName = UUID.randomUUID().toString(); + int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + fileName = fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fos = new FileOutputStream(new File(filePath + File.separator + fileName)); + fs = (BufferedInputStream) multiReq.getInputStream(); + byte[] buffer = new byte[1024]; + int len = 0; + while ((len = fs.read(buffer)) != -1) { + fos.write(buffer, 0, len); + } + fos.close(); + fs.close(); + data.code = ResultData.SUCCESS; + Map map = new HashMap<>(); + map.put("imgarray", server + "/" + fileName); + data.data = map; + } catch (Exception e) { + e.printStackTrace(); + data.code = ResultData.ERROR; + data.message = "上传失败"; + } finally { + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (fs != null) { + try { + fs.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + } return data; } - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java index f3aff2d73..51569a696 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java @@ -1,42 +1,38 @@ package com.simple.controller; -import com.simple.domain.po.MallUserInfo; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxAdminLog; import com.simple.service.WxAdminLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxAdminLog") -public class WxAdminLogController extends BaseController -{ - @Autowired +public class WxAdminLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxAdminLogService wxAdminLogService; - private Logger logger = Logger.getLogger(WxAdminLogController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxAdminLog wxAdminLog,Integer pageNum, Integer pageSize) { - if (null == wxAdminLog) wxAdminLog = new WxAdminLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxAdminLog wxAdminLog, Integer pageNum, Integer pageSize) { + if (null == wxAdminLog) wxAdminLog = new WxAdminLog(); final PageInfo page = wxAdminLogService.listAsPage(wxAdminLog, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxAdminLog wxAdminLog) { //Assert.notNull(wxAdminLog.getName(), "角色名不能为空"); @@ -48,25 +44,25 @@ public class WxAdminLogController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxAdminLog wxAdminLog) { - String tenantId = getTenantId(); - wxAdminLog.setTenantId(tenantId); + String tenantId = getTenantId(); + wxAdminLog.setTenantId(tenantId); wxAdminLogService.saveOrUpdate(wxAdminLog); return new ResultData(); } @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxAdminLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxAdminLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxAdminLogService.getById(id)); } @ApiOperation("PV计数") @@ -77,5 +73,5 @@ public class WxAdminLogController extends BaseController wxAdminLogService.saveLogCount(wxAdminLog); return new ResultData(); } - + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java index d228e669b..c486460ad 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxAppinfo; import com.simple.service.WxAppinfoService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxAppinfo") -public class WxAppinfoController extends BaseController -{ - @Autowired +public class WxAppinfoController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxAppinfoService wxAppinfoService; - private Logger logger = Logger.getLogger(WxAppinfoController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxAppinfo wxAppinfo,Integer pageNum, Integer pageSize) { - if (null == wxAppinfo) wxAppinfo = new WxAppinfo(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxAppinfo wxAppinfo, Integer pageNum, Integer pageSize) { + if (null == wxAppinfo) wxAppinfo = new WxAppinfo(); final PageInfo page = wxAppinfoService.listAsPage(wxAppinfo, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxAppinfo wxAppinfo) { //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxAppinfoController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxAppinfoService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxAppinfoService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxAppinfoService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java index f438992e0..a9471ea97 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBLog") -public class WxBLogController extends BaseController -{ - @Autowired +public class WxBLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxBLogService wxBLogService; - private Logger logger = Logger.getLogger(WxBLogController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBLog wxBLog,Integer pageNum, Integer pageSize) { - if (null == wxBLog) wxBLog = new WxBLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxBLog wxBLog, Integer pageNum, Integer pageSize) { + if (null == wxBLog) wxBLog = new WxBLog(); final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBLog wxBLog) { //Assert.notNull(wxBLog.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxBLogController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBLogService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java index 3cbb7279e..442458afc 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java @@ -7,7 +7,8 @@ import com.simple.domain.po.WxBillRent; import com.simple.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,21 +16,20 @@ import java.util.Map; @RestController @RequestMapping("wxBillRent") -public class WxBillRentController extends BaseController -{ - @Autowired - private WxBillRentService wxBillRentService; +public class WxBillRentController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxBillRentController.class); + @Autowired + private WxBillRentService wxBillRentService; @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBillRent wxBillRent,Integer pageNum, Integer pageSize) { - if (null == wxBillRent) wxBillRent = new WxBillRent(); - wxBillRent.setTenantId(getTenantId()); - wxBillRent.setSortColumns(WxBillRent.Field.Id_DESC); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxBillRent wxBillRent, Integer pageNum, Integer pageSize) { + if (null == wxBillRent) wxBillRent = new WxBillRent(); + wxBillRent.setTenantId(getTenantId()); + wxBillRent.setSortColumns(WxBillRent.Field.Id_DESC); final PageInfo> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); } @@ -40,28 +40,27 @@ public class WxBillRentController extends BaseController //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxBillRent.setTenantId(getTenantId()); wxBillRentService.saveOrUpdate(wxBillRent); - return new ResultData(ResultData.SUCCESS,"操作成功"); + return new ResultData(ResultData.SUCCESS, "操作成功"); } @PostMapping("update") public ResultData update(@RequestBody WxBillRent wxBillRent) { wxBillRentService.saveOrUpdate(wxBillRent); - return new ResultData(ResultData.SUCCESS,"操作成功"); + return new ResultData(ResultData.SUCCESS, "操作成功"); } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBillRentService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBillRentService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java index 3f0d53b90..83aafbcb7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxBusiness; import com.simple.service.WxBusinessService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBusiness") -public class WxBusinessController extends BaseController -{ - @Autowired +public class WxBusinessController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxBusinessService wxBusinessService; - private Logger logger = Logger.getLogger(WxBusinessController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBusiness wxBusiness) { //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxBusinessController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBusinessService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBusinessService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java index 934c12628..b2936f348 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,12 +18,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCLog") -public class WxCLogController extends BaseController -{ +public class WxCLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxCLogService wxCLogService; - - private Logger logger = Logger.getLogger(WxCLogController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index f3e14c975..bfc6c5c2b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -13,7 +13,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,8 @@ import java.util.Map; @RequestMapping("wxCUserBasicInfo") @Api(description = "会员管理相关接口") public class WxCUserBasicInfoController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; @@ -43,8 +46,6 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired private WxCouponService wxCouponService; - private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -54,7 +55,7 @@ public class WxCUserBasicInfoController extends BaseController { if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfoDto(); String tenantId = getTenantId(); wxCUserBasicInfo.setTenantId(tenantId); - PageInfo> page = wxCUserBasicInfoService.queryListMap(wxCUserBasicInfo, pageNum, pageSize); + PageInfo> page = wxCUserBasicInfoService.queryListMap(wxCUserBasicInfo, pageNum, pageSize); // PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); // if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) // && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarController.java index 8fab19e5e..44d6f0dad 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCUserCar; import com.simple.service.WxCUserCarService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCUserCar") -public class WxCUserCarController extends BaseController -{ - @Autowired +public class WxCUserCarController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCUserCarService wxCUserCarService; - private Logger logger = Logger.getLogger(WxCUserCarController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCUserCar wxCUserCar,Integer pageNum, Integer pageSize) { - if (null == wxCUserCar) wxCUserCar = new WxCUserCar(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCUserCar wxCUserCar, Integer pageNum, Integer pageSize) { + if (null == wxCUserCar) wxCUserCar = new WxCUserCar(); final PageInfo page = wxCUserCarService.listAsPage(wxCUserCar, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserCar wxCUserCar) { //Assert.notNull(wxCUserCar.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxCUserCarController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCUserCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserCarService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCUserCarService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java index f93ce3c99..5883930f7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,12 +18,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCUser") -public class WxCUserController extends BaseController -{ +public class WxCUserController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxCUserService wxCUserService; - - private Logger logger = Logger.getLogger(WxCUserController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserDataController.java index e8953e854..055f0b11e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserDataController.java @@ -10,6 +10,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +32,8 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCUserData") @Api(description="会员首页报表数据") -public class WxCUserDataController extends BaseController{ +public class WxCUserDataController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCUserService wxCUserService; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java index 8dc774b51..dda049794 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCUserTags; import com.simple.service.WxCUserTagsService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCUserTags") -public class WxCUserTagsController extends BaseController -{ - @Autowired +public class WxCUserTagsController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCUserTagsService wxCUserTagsService; - private Logger logger = Logger.getLogger(WxCUserTagsController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCUserTags wxCUserTags,Integer pageNum, Integer pageSize) { - if (null == wxCUserTags) wxCUserTags = new WxCUserTags(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCUserTags wxCUserTags, Integer pageNum, Integer pageSize) { + if (null == wxCUserTags) wxCUserTags = new WxCUserTags(); final PageInfo page = wxCUserTagsService.listAsPage(wxCUserTags, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserTags wxCUserTags) { //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxCUserTagsController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCUserTagsService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCUserTagsService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java index 05ec8091e..589e43d4d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java @@ -6,11 +6,9 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCampaign; -import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponChannelVo; import com.simple.enums.EnumCouponChannelType; -import com.simple.enums.EnumCouponStatus; import com.simple.service.WxCampaignService; import com.simple.service.WxCouponChannelService; import com.simple.service.WxCouponService; @@ -19,40 +17,39 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; import static com.simple.domain.po.WxCampaign.Field.SortNum_ASC; @RestController @RequestMapping("wxCampaign") -@Api(description="促销和banner接口") -public class WxCampaignController extends BaseController -{ - @Autowired +@Api(description = "促销和banner接口") +public class WxCampaignController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCampaignService wxCampaignService; - @Autowired + @Autowired private WxCouponService wxCouponService; @Autowired private WxCouponChannelService wxCouponChannelService; - private Logger logger = Logger.getLogger(WxCampaignController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { - if (null == wxCampaign) wxCampaign = new WxCampaign(); - if(wxCampaign.getStatus()!=null&&wxCampaign.getStatus()==-1){ - wxCampaign.setStatus(null); + if (null == wxCampaign) wxCampaign = new WxCampaign(); + if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { + wxCampaign.setStatus(null); } wxCampaign.setTenantId(getTenantId()); wxCampaign.setSortColumns(SortNum_ASC); @@ -60,16 +57,16 @@ public class WxCampaignController extends BaseController return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCampaign wxCampaign) { //Assert.notNull(wxCampaign.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); // int sortNum = wxCampaignService.getMaxSortNum(getTenantId()); - if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { + if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); - }else { + } else { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaign.setStatus(0); @@ -82,10 +79,10 @@ public class WxCampaignController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCampaign wxCampaign) { - if(StringUtils.isNotBlank(wxCampaign.getCouponIds())) { + if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); - }else { + } else { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaignService.saveOrUpdate(wxCampaign); @@ -94,47 +91,47 @@ public class WxCampaignController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCampaignService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - WxCampaign wxCampaign = wxCampaignService.getById(id); - if (wxCampaign != null) { - WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); - wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); - wxCouponChannel.setSubTargetId(wxCampaign.getId()); - wxCouponChannel.setStatus(0); - List couponList = wxCouponChannelService.listAPI(wxCouponChannel); - wxCampaign.setCoupons(couponList); - } - return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); - } + WxCampaign wxCampaign = wxCampaignService.getById(id); + if (wxCampaign != null) { + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); + wxCouponChannel.setSubTargetId(wxCampaign.getId()); + wxCouponChannel.setStatus(0); + List couponList = wxCouponChannelService.listAPI(wxCouponChannel); + wxCampaign.setCoupons(couponList); + } + return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); + } @ApiOperation("调整顺序") @GetMapping("/move") @ApiImplicitParams({ - @ApiImplicitParam(name="sourceId",value="",dataType="Long", paramType = "query",required=true), - @ApiImplicitParam(name="targetId",value="",dataType="Long", paramType = "query",required=true)}) - public ResultData move(Long sourceId,Long targetId) { - WxCampaign source = wxCampaignService.getById(sourceId); + @ApiImplicitParam(name = "sourceId", value = "", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "targetId", value = "", dataType = "Long", paramType = "query", required = true)}) + public ResultData move(Long sourceId, Long targetId) { + WxCampaign source = wxCampaignService.getById(sourceId); WxCampaign target = wxCampaignService.getById(targetId); - if(source==null||target==null){ + if (source == null || target == null) { return new ResultData(Result.ERROR, "调整顺序失败", null); } - int temp =source.getSortNum(); + int temp = source.getSortNum(); source.setSortNum(target.getSortNum()); target.setSortNum(temp); wxCampaignService.saveOrUpdate(source); wxCampaignService.saveOrUpdate(target); return new ResultData(Result.SUCCESS, "调整顺序成功", null); } - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java index 87ced4cb8..3836c6eb9 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java @@ -1,11 +1,11 @@ package com.simple.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.simple.common.ErrorCode; import com.simple.common.Result; -import com.simple.common.ResultData; -import com.simple.domain.po.*; +import com.simple.domain.po.WxCUserCar; +import com.simple.domain.po.WxCarCmdLog; +import com.simple.domain.po.WxPark; import com.simple.enums.EnumCarCmd; import com.simple.enums.EnumCarVendor; import com.simple.enums.EnumCouponSendType; @@ -13,11 +13,14 @@ import com.simple.enums.EnumETCPCode; import com.simple.service.*; import com.simple.utils.ETCPUtil; import com.simple.utils.TJDCarUtil; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.Date; import java.util.HashMap; @@ -26,11 +29,10 @@ import java.util.Map; @RestController @RequestMapping("/carCallback") -public class WxCarCallBackController extends BaseController -{ - private Logger logger = Logger.getLogger(WxCarCallBackController.class); +public class WxCarCallBackController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - ETCPUtil etcp = new ETCPUtil(); + ETCPUtil etcp = new ETCPUtil(); TJDCarUtil tjd = new TJDCarUtil(); @@ -52,19 +54,19 @@ public class WxCarCallBackController extends BaseController /** * ETCP 车辆入场通知 * { - * "synId": "4ebd80ff-cfcf-462a-94cb-727e9fa9547c", - * "plateNumber": "渝 ATX061", - * "parkName": "ETCP 智慧停车场", - * "parkId": "1", - * "entranceTime": "2017-08-20 12:59:54", - * "userType": "76", - * "pushTime": "2017-08-20 12:59:57", - * "fixParkingId": "U7", - * "remainingDays": "11" + * "synId": "4ebd80ff-cfcf-462a-94cb-727e9fa9547c", + * "plateNumber": "渝 ATX061", + * "parkName": "ETCP 智慧停车场", + * "parkId": "1", + * "entranceTime": "2017-08-20 12:59:54", + * "userType": "76", + * "pushTime": "2017-08-20 12:59:57", + * "fixParkingId": "U7", + * "remainingDays": "11" * } - */ + */ @PostMapping(value = "/etcpParkInCallback") - public Result etcpParkInCallback(@RequestBody Map paramMap) { + public Result etcpParkInCallback(@RequestBody Map paramMap) { logger.info("etcpParkInCallback: " + paramMap.toString()); Date currentDate = new Date(); WxCarCmdLog wxCarCmdLog = new WxCarCmdLog(); @@ -82,7 +84,7 @@ public class WxCarCallBackController extends BaseController parkQ.setParkId(etcpParkId); WxPark park = wxParkService.getByObj(parkQ); if (park == null) { - logger.error("etcpParkInCallback: ETCP车场未找到"+ etcpParkId); + logger.error("etcpParkInCallback: ETCP车场未找到" + etcpParkId); //return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); } else { tenantId = park.getTenantId(); @@ -92,8 +94,8 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("etcpParkInCallback: 入库错误 "+ paramMap.toString()); - return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误"+paramMap.toString()); + logger.error("etcpParkInCallback: 入库错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } // 停车发券 @@ -106,7 +108,7 @@ public class WxCarCallBackController extends BaseController userCarQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); // TODO 可能多用户关联同一张车牌 List userCarList = wxCUserCarService.getList(userCarQ); - for(WxCUserCar userCar: userCarList) { + for (WxCUserCar userCar : userCarList) { wxCouponSendService.sendCouponToUser(tenantId, userCar.getCUserId(), EnumCouponSendType.CAR_STOP.getCode()); } } @@ -118,23 +120,23 @@ public class WxCarCallBackController extends BaseController /** * ETCP 车辆出场通知 * { - * "synId": "fd92f645-880e-4c2a-9d7d-7081a2488181", - * "plateNumber": "渝 ATX061", - * "parkName": "ETCP 智慧停车场", - * "parkId": "1", - * "entranceTime": "2017-08-17 18:44:19", - * "userType": "76", - * "pushTime": "2017-08-20 11:57:51", - * "exitTime": "2017-08-19 12:07:19", - * "stayedTime": 148980, - * "receivableFee": 0, - * "paidServiceFee": 0, - * "fixParkingId": "U7", - * "remainingDays": "12" + * "synId": "fd92f645-880e-4c2a-9d7d-7081a2488181", + * "plateNumber": "渝 ATX061", + * "parkName": "ETCP 智慧停车场", + * "parkId": "1", + * "entranceTime": "2017-08-17 18:44:19", + * "userType": "76", + * "pushTime": "2017-08-20 11:57:51", + * "exitTime": "2017-08-19 12:07:19", + * "stayedTime": 148980, + * "receivableFee": 0, + * "paidServiceFee": 0, + * "fixParkingId": "U7", + * "remainingDays": "12" * } - */ + */ @PostMapping(value = "/etcpParkOutCallback") - public Result etcpParkOutCallback(@RequestBody Map paramMap) { + public Result etcpParkOutCallback(@RequestBody Map paramMap) { logger.info("etcpParkOutCallback: " + paramMap.toString()); Date currentDate = new Date(); @@ -151,7 +153,7 @@ public class WxCarCallBackController extends BaseController parkQ.setParkId(etcpParkId); WxPark park = wxParkService.getByObj(parkQ); if (park == null) { - logger.error("etcpParkOutCallback: ETCP车场未找到 "+ etcpParkId); + logger.error("etcpParkOutCallback: ETCP车场未找到 " + etcpParkId); //return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); } else { wxCarCmdLog.setTenantId(park.getTenantId()); @@ -160,8 +162,8 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("etcpParkOutCallback: 入库错误 "+ paramMap.toString()); - return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误"+paramMap.toString()); + logger.error("etcpParkOutCallback: 入库错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } // TODO 如果此车关联了停车优免券，自动把优免券设为已使用 @@ -172,12 +174,12 @@ public class WxCarCallBackController extends BaseController /** * ETCP 车辆解绑通知 * { - * "plateNumber": "渝 ATX061", - * "time": "2017-08-20 11:57:51" + * "plateNumber": "渝 ATX061", + * "time": "2017-08-20 11:57:51" * } - */ + */ @PostMapping(value = "/etcpUnbindCarCallBack") - public Result etcpUnbindCarCallBack(@RequestBody Map paramMap) { + public Result etcpUnbindCarCallBack(@RequestBody Map paramMap) { logger.info("etcpUnbindCarCallBack: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); @@ -193,8 +195,8 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("etcpUnbindCarCallBack: 入库错误 "+ paramMap.toString()); - return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误"+paramMap.toString()); + logger.error("etcpUnbindCarCallBack: 入库错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } WxCUserCar userCarQ = new WxCUserCar(); @@ -213,16 +215,16 @@ public class WxCarCallBackController extends BaseController /** * ETCP 主动支付结果通知 * { - * "plateNumber": "渝 ATX061", - * "orderId": "fd92f645-880e-4c2a-9d7d-7081a2488181", - * "fee": 7.65, - * "paidServiceFee": 0.07, - * "coupon": 0, - * "time": "2017-08-20 11:57:51" + * "plateNumber": "渝 ATX061", + * "orderId": "fd92f645-880e-4c2a-9d7d-7081a2488181", + * "fee": 7.65, + * "paidServiceFee": 0.07, + * "coupon": 0, + * "time": "2017-08-20 11:57:51" * } - */ + */ @PostMapping(value = "/etcpPaidCallback") - public Result etcpPaidCallback(@RequestBody Map paramMap) { + public Result etcpPaidCallback(@RequestBody Map paramMap) { logger.info("etcpPaidCallback: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); @@ -238,8 +240,8 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("etcpPaidCallback: 入库错误 "+ paramMap.toString()); - return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误"+paramMap.toString()); + logger.error("etcpPaidCallback: 入库错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } // 营销 - 短信 @@ -250,23 +252,23 @@ public class WxCarCallBackController extends BaseController /** * TJD 车辆入场通知 * { - * "tradeId": "5836b8b52ada463ebc6199579f029565", - * "outCarId": "45454545454", - * "carNum": "京A45413", - * "carNumColor ": "blue", - * "inDt": "20170319202020", - * "parkName": "测试停车场", - * "parkId": "5836b8b52ada463ebc6199579f029561", - * "lon": "74.000272", - * "lat": "159.768703", - * "wLon": "123.523032", - * "wLat": "35.430735", - * "payUrl": "http://prep.tingjiandan.com/tcweixin/letter/prePay/payInPark.html?prePayType=16&channel=10001", - * "canFindCar": "0" + * "tradeId": "5836b8b52ada463ebc6199579f029565", + * "outCarId": "45454545454", + * "carNum": "京A45413", + * "carNumColor ": "blue", + * "inDt": "20170319202020", + * "parkName": "测试停车场", + * "parkId": "5836b8b52ada463ebc6199579f029561", + * "lon": "74.000272", + * "lat": "159.768703", + * "wLon": "123.523032", + * "wLat": "35.430735", + * "payUrl": "http://prep.tingjiandan.com/tcweixin/letter/prePay/payInPark.html?prePayType=16&channel=10001", + * "canFindCar": "0" * } - */ + */ @RequestMapping(value = "/tjdParkInCallback") - public Map tjdParkInCallback(@RequestBody Map paramMap) { + public Map tjdParkInCallback(@RequestBody Map paramMap) { logger.info("tjdParkInCallback: " + paramMap.toString()); Map map = new HashMap(); @@ -278,9 +280,9 @@ public class WxCarCallBackController extends BaseController parkQ.setParkId(tjdParkId); WxPark park = wxParkService.getByObj(parkQ); if (park == null) { - logger.error("tjdParkInCallback: 停简单车场未找到"+ tjdParkId); + logger.error("tjdParkInCallback: 停简单车场未找到" + tjdParkId); map.put("isSuccess", "0"); - map.put("errorMsg", "停简单车场未找到"+ tjdParkId); + map.put("errorMsg", "停简单车场未找到" + tjdParkId); return map; } @@ -295,10 +297,10 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("tjdParkInCallback: 入库错误"+ paramMap.toString()); + logger.error("tjdParkInCallback: 入库错误" + paramMap.toString()); map.put("isSuccess", "0"); - map.put("errorMsg", "入库错误"+ paramMap.toString()); - return map; + map.put("errorMsg", "入库错误" + paramMap.toString()); + return map; } map.put("isSuccess", "0"); @@ -309,17 +311,17 @@ public class WxCarCallBackController extends BaseController /** * TJD 车辆出场通知 * { - * "tradeId": "5836b8b52ada463ebc6199579f029565", - * "outDt": "20170319232020", - * "lon": "74.000272", - * "lat": "159.768703", - * "wLon": "123.523032", - * "wLat": "35.430735", - * "parkAmount": "5.20" + * "tradeId": "5836b8b52ada463ebc6199579f029565", + * "outDt": "20170319232020", + * "lon": "74.000272", + * "lat": "159.768703", + * "wLon": "123.523032", + * "wLat": "35.430735", + * "parkAmount": "5.20" * } - */ + */ @RequestMapping(value = "/tjdParkoutCallback") - public Map tjdParkOutCallback(@RequestBody Map paramMap) { + public Map tjdParkOutCallback(@RequestBody Map paramMap) { logger.info("tjdParkoutCallback: " + paramMap.toString()); Map map = new HashMap(); @@ -336,15 +338,15 @@ public class WxCarCallBackController extends BaseController try { wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); } catch (Exception e) { - logger.error("tjdParkoutCallback: 入库错误"+ paramMap.toString()); + logger.error("tjdParkoutCallback: 入库错误" + paramMap.toString()); map.put("isSuccess", "0"); - map.put("errorMsg", "入库错误"+ paramMap.toString()); - return map; + map.put("errorMsg", "入库错误" + paramMap.toString()); + return map; } map.put("isSuccess", "0"); map.put("errorMsg", ""); return map; } - + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogController.java index 71a6f542e..c11a53fac 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogController.java @@ -1,40 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCarCmdLog; import com.simple.service.WxCarCmdLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCarCmdLogs") -public class WxCarCmdLogController extends BaseController -{ - private Logger logger = Logger.getLogger(WxCarCmdLogController.class); +public class WxCarCmdLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired + @Autowired private WxCarCmdLogService wxCarCmdLogService; - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCarCmdLog wxCarCmdLogs,Integer pageNum, Integer pageSize) { - if (null == wxCarCmdLogs) wxCarCmdLogs = new WxCarCmdLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCarCmdLog wxCarCmdLogs, Integer pageNum, Integer pageSize) { + if (null == wxCarCmdLogs) wxCarCmdLogs = new WxCarCmdLog(); final PageInfo page = wxCarCmdLogService.listAsPage(wxCarCmdLogs, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCarCmdLog wxCarCmdLog) { //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); @@ -52,19 +50,18 @@ public class WxCarCmdLogController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCarCmdLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCarCmdLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCarCmdLogService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index ff0b4a9c7..49a1be673 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -1,16 +1,12 @@ package com.simple.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.simple.common.ErrorCode; -import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.dto.WxCounponDto; import com.simple.domain.dto.WxCouponCarDto; import com.simple.domain.po.*; import com.simple.domain.vo.WxCouponCarVo; -import com.simple.enums.EnumCarCmd; import com.simple.enums.EnumCarVendor; import com.simple.enums.EnumCouponStatus; import com.simple.service.*; @@ -19,26 +15,22 @@ import com.simple.utils.TJDCarUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.apache.poi.hmef.attribute.MAPIAttribute; -import org.omg.PortableInterceptor.INACTIVE; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; @RestController @RequestMapping("/car") -public class WxCarController extends BaseController -{ - private Logger logger = Logger.getLogger(WxCarController.class); +public class WxCarController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - ETCPUtil etcp = new ETCPUtil(); + ETCPUtil etcp = new ETCPUtil(); TJDCarUtil tjd = new TJDCarUtil(); @@ -69,7 +61,7 @@ public class WxCarController extends BaseController return wxPark; } - @ApiOperation(value = "获取车场支持的厂家",notes="{}") + @ApiOperation(value = "获取车场支持的厂家", notes = "{}") @GetMapping("/getVendor") public ResultData getVendor() { MallUserInfo user = getUser(); @@ -121,9 +113,9 @@ public class WxCarController extends BaseController " ]}}\n") @GetMapping("/quanTemplate") @ApiImplicitParams({ - @ApiImplicitParam(name="merchantId",value="商户ID",dataType="String", paramType = "query",required=true), - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParam(name = "merchantId", value = "商户ID", dataType = "String", paramType = "query", required = true), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { logger.info("quanTemplate: " + merchantId); MallUserInfo user = getUser(); @@ -216,16 +208,16 @@ public class WxCarController extends BaseController WxCoupon wxCoupon = new WxCoupon(); wxCoupon.setTenantId(user.getTenantId()); wxCoupon.setMerchantId(coupon.getMerchantId()); - if(StringUtils.isNotEmpty(coupon.getSalePriceStr())){ - wxCoupon.setSalePrice((int)(Double.parseDouble(coupon.getSalePriceStr())*100)); + if (StringUtils.isNotEmpty(coupon.getSalePriceStr())) { + wxCoupon.setSalePrice((int) (Double.parseDouble(coupon.getSalePriceStr()) * 100)); } - if(StringUtils.isNotEmpty(coupon.getUsePriceStr())){ - wxCoupon.setUsePrice((int)(Double.parseDouble(coupon.getUsePriceStr())*100)); + if (StringUtils.isNotEmpty(coupon.getUsePriceStr())) { + wxCoupon.setUsePrice((int) (Double.parseDouble(coupon.getUsePriceStr()) * 100)); } - if(StringUtils.isNotEmpty(coupon.getPriceStr())){ - wxCoupon.setPrice((int)(Double.parseDouble(coupon.getPriceStr())*100)); + if (StringUtils.isNotEmpty(coupon.getPriceStr())) { + wxCoupon.setPrice((int) (Double.parseDouble(coupon.getPriceStr()) * 100)); } - if(StringUtils.isNotBlank(coupon.getBusiness())) { + if (StringUtils.isNotBlank(coupon.getBusiness())) { String[] arys = coupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } @@ -278,7 +270,7 @@ public class WxCarController extends BaseController @ApiOperation("优免券模板已分配总数") @GetMapping("/templateAmtCount") @ApiImplicitParams({ - @ApiImplicitParam(name="templateId",value="模板ID",dataType="Long", paramType = "query",required=true)}) + @ApiImplicitParam(name = "templateId", value = "模板ID", dataType = "Long", paramType = "query", required = true)}) public ResultData getTemplateAmountSum(Long templateId) { Map map = new HashMap(); Integer amountCount = 0; @@ -294,7 +286,7 @@ public class WxCarController extends BaseController @ApiOperation("优免券模板库存总数") @GetMapping("/templateAvaiCount") @ApiImplicitParams({ - @ApiImplicitParam(name="templateId",value="模板ID",dataType="Long", paramType = "query",required=true)}) + @ApiImplicitParam(name = "templateId", value = "模板ID", dataType = "Long", paramType = "query", required = true)}) public ResultData getTemplateAvailSum(Long templateId) { Map map = new HashMap(); Integer availCount = 0; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java index a439cca3b..e85f62f9b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxChannel; import com.simple.service.WxChannelService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxChannel") -public class WxChannelController extends BaseController -{ - @Autowired +public class WxChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxChannelService wxChannelService; - private Logger logger = Logger.getLogger(WxChannelController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxChannel wxChannel,Integer pageNum, Integer pageSize) { - if (null == wxChannel) wxChannel = new WxChannel(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxChannel wxChannel, Integer pageNum, Integer pageSize) { + if (null == wxChannel) wxChannel = new WxChannel(); final PageInfo page = wxChannelService.listAsPage(wxChannel, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxChannel wxChannel) { //Assert.notNull(wxChannel.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxChannelController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxChannelService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxChannelService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java index 8b0605cc3..99880a50f 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCouponActionLog; import com.simple.service.WxCouponActionLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCouponActionLog") -public class WxCouponActionLogController extends BaseController -{ - @Autowired +public class WxCouponActionLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponActionLogService wxCouponActionLogService; - private Logger logger = Logger.getLogger(WxCouponActionLogController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponActionLog wxCouponActionLog,Integer pageNum, Integer pageSize) { - if (null == wxCouponActionLog) wxCouponActionLog = new WxCouponActionLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponActionLog wxCouponActionLog, Integer pageNum, Integer pageSize) { + if (null == wxCouponActionLog) wxCouponActionLog = new WxCouponActionLog(); final PageInfo page = wxCouponActionLogService.listAsPage(wxCouponActionLog, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxCouponActionLogController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponActionLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponActionLogService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java index bd347e99e..387a22057 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCouponCar; import com.simple.service.WxCouponCarService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCouponCar") -public class WxCouponCarController extends BaseController -{ - @Autowired +public class WxCouponCarController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponCarService wxCouponCarService; - private Logger logger = Logger.getLogger(WxCouponCarController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponCar wxCouponCar,Integer pageNum, Integer pageSize) { - if (null == wxCouponCar) wxCouponCar = new WxCouponCar(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponCar wxCouponCar, Integer pageNum, Integer pageSize) { + if (null == wxCouponCar) wxCouponCar = new WxCouponCar(); final PageInfo page = wxCouponCarService.listAsPage(wxCouponCar, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponCar wxCouponCar) { //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxCouponCarController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponCarService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java index ae2057233..5691a0c3d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -1,24 +1,22 @@ package com.simple.controller; import com.alibaba.fastjson.JSON; -import com.simple.domain.dto.WxCouponChannelDto; -import com.simple.domain.po.MallUserInfo; -import com.simple.domain.po.WxChannel; -import com.simple.domain.vo.WxCouponChannelVo; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - +import com.simple.domain.dto.WxCouponChannelDto; +import com.simple.domain.po.MallUserInfo; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.vo.WxCouponChannelVo; import com.simple.service.WxCouponChannelService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -26,50 +24,47 @@ import java.util.List; @RestController @RequestMapping("wxCouponChannel") -@Api(description="优惠券投放接口") -public class WxCouponChannelController extends BaseController -{ - @Autowired - private WxCouponChannelService wxCouponChannelService; +@Api(description = "优惠券投放接口") +public class WxCouponChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private WxCouponChannelService wxCouponChannelService; - private Logger logger = Logger.getLogger(WxCouponChannelController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { - if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); - if(wxCouponChannel.getStatus()!=null&&wxCouponChannel.getStatus()==-1){ - wxCouponChannel.setStatus(null); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { + if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); + if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { + wxCouponChannel.setStatus(null); } - wxCouponChannel.setTenantId(getUser().getTenantId()); + wxCouponChannel.setTenantId(getUser().getTenantId()); wxCouponChannel.setSortColumns(WxCouponChannel.Field.Id_DESC); final PageInfo page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { wxCouponChannel.setTenantId(getUser().getTenantId()); - if(wxCouponChannel.getCouponId()!=null&&wxCouponChannel.getStatus()!=null){ + if (wxCouponChannel.getCouponId() != null && wxCouponChannel.getStatus() != null) { WxCouponChannel orignal = wxCouponChannelService.getById(wxCouponChannel.getId()); - if(orignal.getStatus()==1&&wxCouponChannel.getStatus()==0){ + if (orignal.getStatus() == 1 && wxCouponChannel.getStatus() == 0) { //查找是否该券 在该频道有其他上架 WxCouponChannel query = new WxCouponChannel(); query.setTenantId(orignal.getTenantId()); query.setCouponId(orignal.getCouponId()); query.setStatus(0);//已上架 query.setTargetAd(orignal.getTargetAd()); - List list = wxCouponChannelService.listAsPage(query,1,1).getList(); - if(list!=null&&list.size()>0){ + List list = wxCouponChannelService.listAsPage(query, 1, 1).getList(); + if (list != null && list.size() > 0) { //不能修改 - return new ResultData(Result.ERROR,"不允许同一个券，多个投放"); + return new ResultData(Result.ERROR, "不允许同一个券，多个投放"); } } @@ -80,17 +75,17 @@ public class WxCouponChannelController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponChannelService.getById(id)); } @ApiOperation("批量新增") @@ -99,30 +94,27 @@ public class WxCouponChannelController extends BaseController String[] ids = wxCouponChannelDto.getCouponIds().split(","); String[] channelId = wxCouponChannelDto.getChannelId().split(","); MallUserInfo user = getUser(); - return wxCouponChannelService.addBatch(ids,channelId,user.getTenantId(),wxCouponChannelDto.getBeginTime(),wxCouponChannelDto.getEndTime()); + return wxCouponChannelService.addBatch(ids, channelId, user.getTenantId(), wxCouponChannelDto.getBeginTime(), wxCouponChannelDto.getEndTime()); } @ApiOperation("根据id查询接口") @GetMapping("/findChannelByCouponId") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findChannelByCouponId(Long id) { - List channellist = new ArrayList<>(); + List channellist = new ArrayList<>(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(0); wxCouponChannel.setCouponId(id); - List list = wxCouponChannelService.listAsPage(wxCouponChannel,1,5).getList(); - if(list.isEmpty()){ - return new ResultData(Result.SUCCESS,"查询成功", ""); + List list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); + if (list.isEmpty()) { + return new ResultData(Result.SUCCESS, "查询成功", ""); } - for (WxCouponChannel temp:list) { + for (WxCouponChannel temp : list) { channellist.add(temp.getTargetAd()); } - return new ResultData(Result.SUCCESS,"查询成功", JSON.toJSONString(channellist)); + return new ResultData(Result.SUCCESS, "查询成功", JSON.toJSONString(channellist)); } - - - } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 4d6868c78..f9bb8d878 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -1,59 +1,51 @@ package com.simple.controller; -import com.simple.domain.po.WxCouponChannel; -import com.simple.service.WxCouponChannelService; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.dto.WxCounponDto; import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxCouponChannel; import com.simple.domain.po.WxMerchant; +import com.simple.service.WxCouponChannelService; import com.simple.service.WxCouponService; import com.simple.service.WxMerchantService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @RestController @RequestMapping("wxCoupon") -@Api(description="优惠券接口") -public class WxCouponController extends BaseController -{ - @Autowired +@Api(description = "优惠券接口") +public class WxCouponController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponService wxCouponService; - - @Autowired - private WxMerchantService wxMerchantService; - @Autowired + + @Autowired + private WxMerchantService wxMerchantService; + @Autowired private WxCouponChannelService wxCouponChannelService; - private Logger logger = Logger.getLogger(WxCouponController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); wxCoupon.setSortColumns(WxCoupon.Field.Id_DESC); @@ -64,37 +56,37 @@ public class WxCouponController extends BaseController List wxCouponList = page.getList(); - if(wxCouponList.isEmpty()){ + if (wxCouponList.isEmpty()) { return new ResultData(page); } - List ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList()); + List ids = wxCouponList.stream().map(p -> p.getId()).collect(Collectors.toList()); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setCouponIds(ids); wxCouponChannel.setStatus(0); //上架状态 - List list = wxCouponChannelService.listAsPage(wxCouponChannel,1,10000).getList(); - if(!list.isEmpty()){ + List list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 10000).getList(); + if (!list.isEmpty()) { Map> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId)); - for (WxCoupon temp:wxCouponList) { + for (WxCoupon temp : wxCouponList) { - if(groupBy.get(temp.getId())!=null){ - List channels=new ArrayList<>(); - for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { - if(!channels.contains(tempchannel.getTargetAd())) { + if (groupBy.get(temp.getId()) != null) { + List channels = new ArrayList<>(); + for (WxCouponChannel tempchannel : groupBy.get(temp.getId())) { + if (!channels.contains(tempchannel.getTargetAd())) { channels.add(tempchannel.getTargetAd()); } } String sss = JSON.toJSONString(channels); temp.setChannels(sss); - }else{ + } else { temp.setChannels(""); } } - }else{ - for (WxCoupon temp:wxCouponList) { + } else { + for (WxCoupon temp : wxCouponList) { temp.setChannels(""); } @@ -103,76 +95,76 @@ public class WxCouponController extends BaseController return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCoupon wxCoupon) { //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - if(StringUtils.isNotEmpty(wxCoupon.getSalePriceStr())){ - wxCoupon.setSalePrice((int)(Double.parseDouble(wxCoupon.getSalePriceStr())*100)); + if (StringUtils.isNotEmpty(wxCoupon.getSalePriceStr())) { + wxCoupon.setSalePrice((int) (Double.parseDouble(wxCoupon.getSalePriceStr()) * 100)); + } + if (StringUtils.isNotEmpty(wxCoupon.getUsePriceStr())) { + wxCoupon.setUsePrice((int) (Double.parseDouble(wxCoupon.getUsePriceStr()) * 100)); } - if(StringUtils.isNotEmpty(wxCoupon.getUsePriceStr())){ - wxCoupon.setUsePrice((int)(Double.parseDouble(wxCoupon.getUsePriceStr())*100)); + if (StringUtils.isNotEmpty(wxCoupon.getPriceStr())) { + wxCoupon.setPrice((int) (Double.parseDouble(wxCoupon.getPriceStr()) * 100)); } - if(StringUtils.isNotEmpty(wxCoupon.getPriceStr())){ - wxCoupon.setPrice((int)(Double.parseDouble(wxCoupon.getPriceStr())*100)); + if (StringUtils.isNotBlank(wxCoupon.getBusiness())) { + String[] arys = wxCoupon.getBusiness().split(","); + wxCoupon.setBusiness(JSON.toJSONString(arys)); } - if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } wxCoupon.setTenantId(getUser().getTenantId()); wxCoupon.setChannels(""); - Long id = wxCouponService.saveOrUpdate(wxCoupon); + Long id = wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(id); } @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCoupon wxCoupon) { - if(wxCoupon.getId()==null) { - return new ResultData(ResultData.ERROR,"缺少id"); - } - if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); + if (wxCoupon.getId() == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + if (StringUtils.isNotBlank(wxCoupon.getBusiness())) { + String[] arys = wxCoupon.getBusiness().split(","); + wxCoupon.setBusiness(JSON.toJSONString(arys)); } return wxCouponService.updateCoupon(wxCoupon); } @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - WxCoupon c = wxCouponService.getById(id); - WxCounponDto dto = new WxCounponDto(); - org.springframework.beans.BeanUtils.copyProperties(c, dto); - WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); - dto.setWxMerchant(merchant); - return new ResultData(Result.SUCCESS,"查询成功",dto); + WxCoupon c = wxCouponService.getById(id); + WxCounponDto dto = new WxCounponDto(); + org.springframework.beans.BeanUtils.copyProperties(c, dto); + WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); + dto.setWxMerchant(merchant); + return new ResultData(Result.SUCCESS, "查询成功", dto); } @ApiOperation("分页列表接口") @GetMapping("send/list") @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData sendList(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData sendList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); wxCoupon.setStatus(0); return new ResultData(wxCouponService.listAsPage(wxCoupon, pageNum, pageSize)); } - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java index df6a5fcea..61c16e28c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -7,7 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -19,33 +20,31 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxCouponOrder") -@Api(description="核销和用户卡券查询接口") -public class WxCouponOrderController extends BaseController -{ - @Autowired +@Api(description = "核销和用户卡券查询接口") +public class WxCouponOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponOrderService wxCouponOrderService; - private Logger logger = Logger.getLogger(WxCouponOrderController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { - if (wxCouponOrder == null) wxCouponOrder= new WxCouponOrder(); + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } @RequestMapping("/exportData") - public void exportData(HttpServletRequest request, HttpServletResponse response){ + public void exportData(HttpServletRequest request, HttpServletResponse response) { - wxCouponOrderService.exportData(request,response,getTenantId()); + wxCouponOrderService.exportData(request, response, getTenantId()); } - } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index b2b0dc92f..112664b0c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -1,63 +1,59 @@ package com.simple.controller; -import com.simple.domain.po.WxCoupon; -import com.simple.service.WxCouponService; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - +import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponSend; import com.simple.service.WxCouponSendService; +import com.simple.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; @RestController @RequestMapping("wxCouponSend") -public class WxCouponSendController extends BaseController -{ - @Autowired +public class WxCouponSendController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponSendService wxCouponSendService; - @Autowired + @Autowired private WxCouponService wxCouponService; - private Logger logger = Logger.getLogger(WxCouponSendController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponSend wxCouponSend,Integer pageNum, Integer pageSize) { - if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { + if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); wxCouponSend.setTenantId(getTenantId()); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponSend wxCouponSend) { - if (null == wxCouponSend){ - return new ResultData(Result.ERROR,"参数不对"); + if (null == wxCouponSend) { + return new ResultData(Result.ERROR, "参数不对"); } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(0); - List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); - if(wxCouponSendList!=null&&!wxCouponSendList.isEmpty()){ - return new ResultData(Result.ERROR,"已经添加过该券"); + List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); + if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { + return new ResultData(Result.ERROR, "已经添加过该券"); } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); - if(wxCoupon.getStatus()!=0||wxCoupon.getSendType()!=2){ - return new ResultData(Result.ERROR,"该券的状态有问题"); + if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) { + return new ResultData(Result.ERROR, "该券的状态有问题"); } wxCouponSend.setMerchantId(wxCoupon.getMerchantId()); @@ -74,26 +70,25 @@ public class WxCouponSendController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponSend wxCouponSend) { - wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.setTenantId(getTenantId()); wxCouponSendService.saveOrUpdate(wxCouponSend); return new ResultData(); } @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponSendService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponSendService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponSendService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java index 538e16131..95599448c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java @@ -1,49 +1,46 @@ package com.simple.controller; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCouponSpread; import com.simple.service.WxCouponSpreadService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequestMapping("wxCouponSpread") -@Api(description="推广接口") -public class WxCouponSpreadController extends BaseController -{ - @Autowired +@Api(description = "推广接口") +public class WxCouponSpreadController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponSpreadService wxCouponSpreadService; - private Logger logger = Logger.getLogger(WxCouponSpreadController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponSpread wxCouponSpread,Integer pageNum, Integer pageSize) { - if (null == wxCouponSpread) wxCouponSpread = new WxCouponSpread(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponSpread wxCouponSpread, Integer pageNum, Integer pageSize) { + if (null == wxCouponSpread) wxCouponSpread = new WxCouponSpread(); final PageInfo page = wxCouponSpreadService.listAsPage(wxCouponSpread, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponSpread wxCouponSpread) { - if(wxCouponSpread.getCouponId()==null){ - return new ResultData(Result.ERROR,"没有找到券id"); + if (wxCouponSpread.getCouponId() == null) { + return new ResultData(Result.ERROR, "没有找到券id"); } //Assert.notNull(wxCouponSpread.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); @@ -60,35 +57,34 @@ public class WxCouponSpreadController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponSpreadService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponSpreadService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponSpreadService.getById(id)); } @ApiOperation("根据卡券id查询接口") @GetMapping("/findByCouponId") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findByCouponId(Long id) { WxCouponSpread result = null; - if(id!=null){ - WxCouponSpread wxCouponSpread = new WxCouponSpread(); + if (id != null) { + WxCouponSpread wxCouponSpread = new WxCouponSpread(); wxCouponSpread.setCouponId(id); List list = wxCouponSpreadService.findList(wxCouponSpread); - if(!list.isEmpty()){ + if (!list.isEmpty()) { result = list.get(0); } } - return new ResultData(Result.SUCCESS,"查询成功",result); + return new ResultData(Result.SUCCESS, "查询成功", result); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java index 562d2c543..8ddb4a317 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -1,44 +1,40 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxCouponType; import com.simple.service.WxCouponTypeService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCouponType") -@Api(description="优惠券类型相关接口") -public class WxCouponTypeController extends BaseController -{ - @Autowired +@Api(description = "优惠券类型相关接口") +public class WxCouponTypeController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCouponTypeService wxCouponTypeService; - private Logger logger = Logger.getLogger(WxCouponTypeController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponType wxCouponType,Integer pageNum, Integer pageSize) { - if (null == wxCouponType) wxCouponType = new WxCouponType(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponType wxCouponType, Integer pageNum, Integer pageSize) { + if (null == wxCouponType) wxCouponType = new WxCouponType(); final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponType wxCouponType) { //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); @@ -56,19 +52,18 @@ public class WxCouponTypeController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxCouponTypeService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponTypeService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxGroupController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxGroupController.java index b4af5046e..8502edb93 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxGroupController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxGroupController.java @@ -7,25 +7,25 @@ import com.simple.domain.po.WxGroup; import com.simple.service.WxGroupService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxGroup") -public class WxGroupController extends BaseController -{ - @Autowired - private WxGroupService wxGroupService; +public class WxGroupController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxGroupController.class); + @Autowired + private WxGroupService wxGroupService; @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxGroup wxGroup,Integer pageNum, Integer pageSize) { - if (null == wxGroup) wxGroup = new WxGroup(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxGroup wxGroup, Integer pageNum, Integer pageSize) { + if (null == wxGroup) wxGroup = new WxGroup(); final PageInfo page = wxGroupService.listAsPage(wxGroup, pageNum, pageSize); return new ResultData(page); } @@ -45,18 +45,17 @@ public class WxGroupController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { wxGroupService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { - return new ResultData(Result.SUCCESS,"查询成功",wxGroupService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxGroupService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java index 343467087..9c9cc1914 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -24,12 +25,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxLevelConfig") @Api(description="等级权益相关接口") -public class WxLevelConfigController extends BaseController -{ +public class WxLevelConfigController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxLevelConfigService wxLevelConfigService; - - private Logger logger = Logger.getLogger(WxLevelConfigController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java index ebde966f0..edfbd6b0b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java @@ -8,25 +8,25 @@ import com.simple.domain.po.WxMsgValidationcode; import com.simple.service.WxMallApplyService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMallApply") -public class WxMallApplyController extends BaseController -{ - @Autowired - private WxMallApplyService wxMallApplyService; +public class WxMallApplyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxMallApplyController.class); + @Autowired + private WxMallApplyService wxMallApplyService; @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMallApply wxMallApply,Integer pageNum, Integer pageSize) { - if (null == wxMallApply) wxMallApply = new WxMallApply(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMallApply wxMallApply, Integer pageNum, Integer pageSize) { + if (null == wxMallApply) wxMallApply = new WxMallApply(); final PageInfo page = wxMallApplyService.listAsPage(wxMallApply, pageNum, pageSize); return new ResultData(page); } @@ -46,16 +46,16 @@ public class WxMallApplyController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { wxMallApplyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMallApplyService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMallApplyService.getById(id)); } @@ -70,6 +70,6 @@ public class WxMallApplyController extends BaseController wxMsgValidationcode.setType(type); return wxMallApplyService.sendvalidationcode(wxMsgValidationcode); } - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java index c5c22dc42..f79a6f0ee 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -8,18 +8,18 @@ import com.simple.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMallBuilding") -public class WxMallBuildingController extends BaseController -{ +public class WxMallBuildingController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMallBuildingService wxMallBuildingService; - - private Logger logger = Logger.getLogger(WxMallBuildingController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallConfigController.java index 2954dfe65..0a3f4d32b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallConfigController.java @@ -1,81 +1,75 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; import com.simple.domain.po.WxMallConfig; import com.simple.service.WxMallConfigService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMallConfig") -@Api(description="停车发券和核销发劵接口") -public class WxMallConfigController extends BaseController -{ - @Autowired +@Api(description = "停车发券和核销发劵接口") +public class WxMallConfigController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMallConfigService wxMallConfigService; - private Logger logger = Logger.getLogger(WxMallConfigController.class); - @ApiOperation("获取停车劵开关") @GetMapping("getStopCarConpon") public ResultData getStopCarConpon() { - WxMallConfig wxMallConfig = new WxMallConfig(); - wxMallConfig.setKey("stopCarCouponSwitch"); - wxMallConfig.setTenantId(getTenantId()); - PageInfo page = wxMallConfigService.listAsPage(wxMallConfig, 1, 1); - if(page.getSize()>0) { - WxMallConfig config = page.getList().get(0); - return new ResultData(config); - } - return new ResultData(); + WxMallConfig wxMallConfig = new WxMallConfig(); + wxMallConfig.setKey("stopCarCouponSwitch"); + wxMallConfig.setTenantId(getTenantId()); + PageInfo page = wxMallConfigService.listAsPage(wxMallConfig, 1, 1); + if (page.getSize() > 0) { + WxMallConfig config = page.getList().get(0); + return new ResultData(config); + } + return new ResultData(); } - + @ApiOperation("获取核销劵开关") @GetMapping("getVerifyConpon") public ResultData getVerifyConpon() { - WxMallConfig wxMallConfig = new WxMallConfig(); - wxMallConfig.setKey("verifyConponSwitch"); - wxMallConfig.setTenantId(getTenantId()); - PageInfo page = wxMallConfigService.listAsPage(wxMallConfig, 1, 1); - if(page.getSize()>0) { - WxMallConfig config = page.getList().get(0); - return new ResultData(config); - } - return new ResultData(); + WxMallConfig wxMallConfig = new WxMallConfig(); + wxMallConfig.setKey("verifyConponSwitch"); + wxMallConfig.setTenantId(getTenantId()); + PageInfo page = wxMallConfigService.listAsPage(wxMallConfig, 1, 1); + if (page.getSize() > 0) { + WxMallConfig config = page.getList().get(0); + return new ResultData(config); + } + return new ResultData(); } - + @PostMapping("updateStopCarConpon") @ApiOperation("修改停车开关") public ResultData updateStopCarConpon(@RequestBody WxMallConfig wxMallConfig) { - WxMallConfig temp = new WxMallConfig(); + WxMallConfig temp = new WxMallConfig(); // temp.setKey("stopCarCouponSwitch"); - temp.setValue(wxMallConfig.getValue()); - temp.setId(wxMallConfig.getId()); - wxMallConfigService.saveOrUpdate(temp); - return new ResultData(); + temp.setValue(wxMallConfig.getValue()); + temp.setId(wxMallConfig.getId()); + wxMallConfigService.saveOrUpdate(temp); + return new ResultData(); } - + @PostMapping("updateVerifyConpon") @ApiOperation("修改核销开关") public ResultData updateVerifyConpon(@RequestBody WxMallConfig wxMallConfig) { - WxMallConfig temp = new WxMallConfig(); + WxMallConfig temp = new WxMallConfig(); // temp.setKey("verifyConponSwitch"); - temp.setValue(wxMallConfig.getValue()); - temp.setId(wxMallConfig.getId()); - wxMallConfigService.saveOrUpdate(temp); - return new ResultData(); + temp.setValue(wxMallConfig.getValue()); + temp.setId(wxMallConfig.getId()); + wxMallConfigService.saveOrUpdate(temp); + return new ResultData(); } - + // @ApiOperation("分页列表接口") // @GetMapping("list") // @ApiImplicitParams({ @@ -117,7 +111,6 @@ public class WxMallConfigController extends BaseController // public ResultData findById(Long id) { // return new ResultData(Result.SUCCESS,"查询成功",wxMallConfigService.getById(id)); // } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java index def24e2a4..1cf5ee598 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,12 +18,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxMall") -public class WxMallController extends BaseController -{ +public class WxMallController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMallService wxMallService; - - private Logger logger = Logger.getLogger(WxMallController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java index 8f6a572b7..8d073b962 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,12 +18,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxMallFloor") -public class WxMallFloorController extends BaseController -{ +public class WxMallFloorController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMallFloorService wxMallFloorService; - - private Logger logger = Logger.getLogger(WxMallFloorController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java index 7ed244c44..03325eddd 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -10,7 +10,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,12 +19,11 @@ import java.util.Map; @RestController @RequestMapping("wxMerchantBUser") -public class WxMerchantBUserController extends BaseController -{ +public class WxMerchantBUserController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMerchantBUserService wxMerchantBUserService; - - private Logger logger = Logger.getLogger(WxMerchantBUserController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 484784ee9..6be3711a4 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -8,7 +8,8 @@ import com.simple.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,11 +18,11 @@ import java.util.List; @RestController @RequestMapping("wxMerchant") public class WxMerchantController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMerchantService wxMerchantService; - private Logger logger = Logger.getLogger(WxMerchantController.class); - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java index 566c72eba..c3f9de903 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -9,26 +9,26 @@ import com.simple.service.WxMerchantShopService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMerchantShop") -public class WxMerchantShopController extends BaseController -{ - @Autowired +public class WxMerchantShopController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMerchantShopService wxMerchantShopService; - private Logger logger = Logger.getLogger(WxMerchantShopController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMerchantShop wxMerchantShop,Integer pageNum, Integer pageSize) { - if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) { + if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); final PageInfo page = wxMerchantShopService.listAsPage(wxMerchantShop, pageNum, pageSize); return new ResultData(page); } @@ -36,16 +36,16 @@ public class WxMerchantShopController extends BaseController @ApiOperation("获取关联商铺信息") @GetMapping("queryShopList") @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop,Integer pageNum, Integer pageSize) { + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) { if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); final PageInfo page = wxMerchantShopService.queryShopList(wxMerchantShop, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); @@ -63,19 +63,18 @@ public class WxMerchantShopController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMerchantShopService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantShopService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index eccfc627a..9ff909959 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.service.WxMerchantTradeDailyService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMerchantTradeDaily") -public class WxMerchantTradeDailyController extends BaseController -{ - @Autowired +public class WxMerchantTradeDailyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMerchantTradeDailyService wxMerchantTradeDailyService; - private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily,Integer pageNum, Integer pageSize) { - if (null == wxMerchantTradeDaily) wxMerchantTradeDaily = new WxMerchantTradeDaily(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum, Integer pageSize) { + if (null == wxMerchantTradeDaily) wxMerchantTradeDaily = new WxMerchantTradeDaily(); final PageInfo page = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { //Assert.notNull(wxMerchantTradeDaily.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxMerchantTradeDailyController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMerchantTradeDailyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDailyService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantTradeDailyService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java index f2c57aa9a..8fd4a8026 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -8,7 +8,8 @@ import com.simple.service.WxMsgCallbackService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,26 +17,25 @@ import java.util.Map; @RestController @RequestMapping("wxMsgCallback") -public class WxMsgCallbackController extends BaseController -{ - @Autowired +public class WxMsgCallbackController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMsgCallbackService wxMsgCallbackService; - private Logger logger = Logger.getLogger(WxMsgCallbackController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback,Integer pageNum, Integer pageSize) { - if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); - wxMsgCallback.setTenantId(getTenantId()); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { + if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); + wxMsgCallback.setTenantId(getTenantId()); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); @@ -54,41 +54,41 @@ public class WxMsgCallbackController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMsgCallbackService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgCallbackService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgCallbackService.getById(id)); } @RequestMapping(value = "/receivemsg/{bid}") - public void receivemsg(@PathVariable String bid, @RequestParam Map param) { + public void receivemsg(@PathVariable String bid, @RequestParam Map param) { //解析param数据插入数据库中 String item = param.get("item"); String sign = param.get("sign"); - String tenantId=getTenantId(); - wxMsgCallbackService.saveOrUpdate(tenantId,bid,item,sign); + String tenantId = getTenantId(); + wxMsgCallbackService.saveOrUpdate(tenantId, bid, item, sign); } @RequestMapping(value = "/receivemodel/{bid}") - public void receivemodel(@PathVariable String bid, @RequestParam Map param) { + public void receivemodel(@PathVariable String bid, @RequestParam Map param) { //解析param数据插入数据库中 - wxMsgCallbackService.receivemodel(getTenantId(),bid,param); + wxMsgCallbackService.receivemodel(getTenantId(), bid, param); } @RequestMapping(value = "/receiveverifymodel/{bid}") - public void receiveverifymodel(@PathVariable String bid, @RequestParam Map param) { + public void receiveverifymodel(@PathVariable String bid, @RequestParam Map param) { //解析param数据插入数据库中 - wxMsgCallbackService.receiveverifymodel(bid,param); + wxMsgCallbackService.receiveverifymodel(bid, param); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java index 7ec2199c4..475ec0445 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxMsgConfig; import com.simple.service.WxMsgConfigService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgConfig") -public class WxMsgConfigController extends BaseController -{ - @Autowired +public class WxMsgConfigController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMsgConfigService wxMsgConfigService; - private Logger logger = Logger.getLogger(WxMsgConfigController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) { - if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig, Integer pageNum, Integer pageSize) { + if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxMsgConfigController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMsgConfigService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgConfigService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index 813029468..bfdb36246 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -10,7 +10,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -21,26 +22,25 @@ import java.util.UUID; @RestController @RequestMapping("wxMsg") -public class WxMsgController extends BaseController -{ - @Autowired +public class WxMsgController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMsgService wxMsgService; - private Logger logger = Logger.getLogger(WxMsgController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsg wxMsg,Integer pageNum, Integer pageSize) { - if (null == wxMsg) wxMsg = new WxMsg(); - wxMsg.setTenantId(getTenantId()); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { + if (null == wxMsg) wxMsg = new WxMsg(); + wxMsg.setTenantId(getTenantId()); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsg wxMsg) { //Assert.notNull(wxMsg.getName(), "角色名不能为空"); @@ -59,41 +59,41 @@ public class WxMsgController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMsgService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgService.getById(id)); } @RequestMapping("/excleupload") public ResultData excleupload(@RequestParam("file") MultipartFile file) { if (file.isEmpty()) { - return new ResultData(Result.SUCCESS,"上传文件不能为空"); + return new ResultData(Result.SUCCESS, "上传文件不能为空"); } - String filename= UUID.randomUUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - File path=new File(Constant.fileDirectory); - if(!path.exists()){ + String filename = UUID.randomUUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + File path = new File(Constant.fileDirectory); + if (!path.exists()) { path.mkdirs(); } - String filepath= Constant.fileDirectory+File.separator+filename; + String filepath = Constant.fileDirectory + File.separator + filename; try { - FileOutputStream out=new FileOutputStream(new File(filepath)); + FileOutputStream out = new FileOutputStream(new File(filepath)); IOUtils.write(file.getBytes(), out); IOUtils.closeQuietly(out); } catch (Exception e) { - return new ResultData(Result.ERROR,"上传失败"); + return new ResultData(Result.ERROR, "上传失败"); } - return new ResultData(Result.SUCCESS,"上传成功",filepath); + return new ResultData(Result.SUCCESS, "上传成功", filepath); } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java index 37c5520cd..70850fe24 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java @@ -8,39 +8,39 @@ import com.simple.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgModel") -public class WxMsgModelController extends BaseController -{ - @Autowired +public class WxMsgModelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxMsgModelService wxMsgModelService; - private Logger logger = Logger.getLogger(WxMsgModelController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsgModel wxMsgModel,Integer pageNum, Integer pageSize) { - if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); - wxMsgModel.setTenantId(getTenantId()); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { + if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); + wxMsgModel.setTenantId(getTenantId()); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgModel wxMsgModel) { //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsgModel.setTenantId(getTenantId()); return wxMsgModelService.saveOrUpdate(wxMsgModel); - + } @ApiOperation("根据id更新接口") @@ -51,25 +51,24 @@ public class WxMsgModelController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMsgModelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgModelService.getById(id)); } @ApiOperation("获取所有数据") @GetMapping("getmodellist") public ResultData getmodellist() { - return wxMsgModelService.getmodellist(getTenantId()); + return wxMsgModelService.getmodellist(getTenantId()); } - } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java index 0ffa82220..fe147d87f 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -14,26 +14,25 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgSignature") -public class WxMsgSignatureController extends BaseController -{ - @Autowired +public class WxMsgSignatureController extends BaseController { + @Autowired private WxMsgSignatureService wxMsgSignatureService; private Logger logger = Logger.getLogger(WxMsgSignatureController.class); - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature,Integer pageNum, Integer pageSize) { - if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); - wxMsgSignature.setTenantId(getTenantId()); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { + if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); + wxMsgSignature.setTenantId(getTenantId()); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); @@ -52,17 +51,17 @@ public class WxMsgSignatureController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMsgSignatureService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgSignatureService.getById(id)); } @ApiOperation("获取所有数据") @@ -70,6 +69,6 @@ public class WxMsgSignatureController extends BaseController public ResultData getmodellist() { return wxMsgSignatureService.getsignaturelist(getTenantId()); } - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index e253dda99..3523df9c2 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -7,19 +7,19 @@ import com.simple.domain.po.WxMsgValidationcode; import com.simple.service.WxMsgValidationcodeService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgValidationcode") -public class WxMsgValidationcodeController extends BaseController -{ +public class WxMsgValidationcodeController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; - private Logger logger = Logger.getLogger(WxMsgValidationcodeController.class); - @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java index d59ab7fb9..3dcc10ffe 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java @@ -7,25 +7,25 @@ import com.simple.domain.po.WxMsgValidationcodeModel; import com.simple.service.WxMsgValidationcodeModelService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgValidationcodeModel") -public class WxMsgValidationcodeModelController extends BaseController -{ - @Autowired - private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; +public class WxMsgValidationcodeModelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxMsgValidationcodeModelController.class); + @Autowired + private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel,Integer pageNum, Integer pageSize) { - if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { + if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); return new ResultData(page); } @@ -45,18 +45,17 @@ public class WxMsgValidationcodeModelController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(String id) { wxMsgValidationcodeModelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(String id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgValidationcodeModelService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMsgValidationcodeModelService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java index d7b0cbf24..5cfbc6f18 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,9 +18,8 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxOrder") -public class WxOrderController extends BaseController -{ - private Logger logger = Logger.getLogger(WxOrderController.class); +public class WxOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxOrderService wxOrderService; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java index 2f7309c99..780fe627e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxPark; import com.simple.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxPark") -public class WxParkController extends BaseController -{ - @Autowired +public class WxParkController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxParkService wxParkService; - private Logger logger = Logger.getLogger(WxParkController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxPark wxPark,Integer pageNum, Integer pageSize) { - if (null == wxPark) wxPark = new WxPark(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxPark wxPark, Integer pageNum, Integer pageSize) { + if (null == wxPark) wxPark = new WxPark(); final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxPark wxPark) { //Assert.notNull(wxPark.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxParkController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxParkService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxParkService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayAccountController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayAccountController.java index 2a677e2af..0e390a3e5 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayAccountController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayAccountController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -17,12 +18,11 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxPayAccount") -public class WxPayAccountController extends BaseController -{ +public class WxPayAccountController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxPayAccountService wxPayAccountService; - - private Logger logger = Logger.getLogger(WxPayAccountController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java index 6c7bcc575..9ba8d3682 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java @@ -9,8 +9,9 @@ import com.simple.service.WxProfitSharingOrderService; import com.simple.service.WxRefundOrderService; import com.simple.utils.XmlUtil; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; import org.jdom.JDOMException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,7 +29,7 @@ import java.util.TreeMap; @RequestMapping("/wxPay/notify") public class WxPayController extends BaseController { - private Logger logger = Logger.getLogger(WxPayController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxPayOrderService wxPayOrderService; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java index 1504b07cb..b90611ea1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java @@ -2,7 +2,8 @@ package com.simple.controller; import com.simple.service.WxAppinfoService; import com.simple.service.WxProfitSharingOrderService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,9 +19,8 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxPayOrder") -public class WxPayOrderController extends BaseController -{ - private Logger logger = Logger.getLogger(WxPayOrderController.class); +public class WxPayOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxPayOrderService wxPayOrderService; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java index d4c23a40a..942a5a99f 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java @@ -11,7 +11,8 @@ import com.simple.service.WxProfitSharingReceiverService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,13 +21,13 @@ import java.util.List; @RestController @RequestMapping("wxProfitSharingReceiver") public class WxProfitSharingReceiverController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxProfitSharingReceiverService wxProfitSharingReceiverService; @Autowired private WxMerchantService wxMerchantService; - private Logger logger = Logger.getLogger(WxProfitSharingReceiverController.class); - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxRefundOrderController.java index 03b27c97b..0ae455bd7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -1,6 +1,7 @@ package com.simple.controller; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -20,11 +21,11 @@ import java.util.Map; @RestController @RequestMapping("/api/refund") public class WxRefundOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxRefundOrderService wxRefundOrderService; - private Logger logger = Logger.getLogger(WxRefundOrderController.class); - @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxRentContractController.java index 868b8761e..01a8b042b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxRentContractController.java @@ -7,19 +7,19 @@ import com.simple.domain.po.WxRentContract; import com.simple.service.WxRentContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxRentContract") -public class WxRentContractController extends BaseController -{ +public class WxRentContractController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxRentContractService wxRentContractService; - private Logger logger = Logger.getLogger(WxRentContractController.class); - @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java index 56794ac8a..bbb87369b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxScoreHistory; import com.simple.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxScoreHistory") -public class WxScoreHistoryController extends BaseController -{ - @Autowired +public class WxScoreHistoryController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxScoreHistoryService wxScoreHistoryService; - private Logger logger = Logger.getLogger(WxScoreHistoryController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory,Integer pageNum, Integer pageSize) { - if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory, Integer pageNum, Integer pageSize) { + if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxScoreHistoryController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxScoreHistoryService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxScoreHistoryService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java index d0a55cf75..2d5ed13ae 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -1,50 +1,46 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxScoreRules; import com.simple.service.WxScoreRulesService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxScoreRules") -@Api(description="成长值规则相关接口") -public class WxScoreRulesController extends BaseController -{ - @Autowired +@Api(description = "成长值规则相关接口") +public class WxScoreRulesController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxScoreRulesService wxScoreRulesService; - private Logger logger = Logger.getLogger(WxScoreRulesController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxScoreRules wxScoreRules,Integer pageNum, Integer pageSize) { - if (null == wxScoreRules) wxScoreRules = new WxScoreRules(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxScoreRules wxScoreRules, Integer pageNum, Integer pageSize) { + if (null == wxScoreRules) wxScoreRules = new WxScoreRules(); final PageInfo page = wxScoreRulesService.listAsPage(wxScoreRules, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreRules wxScoreRules) { //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxScoreRules.setTenantId(getTenantId()); - wxScoreRulesService.saveOrUpdate(wxScoreRules); + wxScoreRules.setTenantId(getTenantId()); + wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); } @@ -57,19 +53,18 @@ public class WxScoreRulesController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxScoreRulesService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxScoreRulesService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java index 1271b55d5..b5c2b3287 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -1,41 +1,38 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxScoreValidityPeriod; import com.simple.service.WxScoreValidityPeriodService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxScoreValidityPeriod") -public class WxScoreValidityPeriodController extends BaseController -{ - @Autowired +public class WxScoreValidityPeriodController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxScoreValidityPeriodService wxScoreValidityPeriodService; - private Logger logger = Logger.getLogger(WxScoreValidityPeriodController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxScoreValidityPeriod wxScoreValidityPeriod,Integer pageNum, Integer pageSize) { - if (null == wxScoreValidityPeriod) wxScoreValidityPeriod = new WxScoreValidityPeriod(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxScoreValidityPeriod wxScoreValidityPeriod, Integer pageNum, Integer pageSize) { + if (null == wxScoreValidityPeriod) wxScoreValidityPeriod = new WxScoreValidityPeriod(); final PageInfo page = wxScoreValidityPeriodService.listAsPage(wxScoreValidityPeriod, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); @@ -53,19 +50,18 @@ public class WxScoreValidityPeriodController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxScoreValidityPeriodService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxScoreValidityPeriodService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index 2c9adbc7c..3b0769e14 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -3,13 +3,13 @@ package com.simple.controller; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxShop; import com.simple.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,28 +17,27 @@ import java.util.Map; @RestController @RequestMapping("wxShop") -public class WxShopController extends BaseController -{ - @Autowired - private WxShopService wxShopService; +public class WxShopController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxShopController.class); + @Autowired + private WxShopService wxShopService; @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { - if (null == wxShop) wxShop = new WxShop(); - wxShop.setTenantId(getTenantId()); - wxShop.setSortColumns(WxShop.Field.Id_DESC); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { + if (null == wxShop) wxShop = new WxShop(); + wxShop.setTenantId(getTenantId()); + wxShop.setSortColumns(WxShop.Field.Id_DESC); - final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); + final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxShop wxShop) { //Assert.notNull(wxShop.getName(), "角色名不能为空"); @@ -57,32 +56,32 @@ public class WxShopController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxShopService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxShopService.getById(id)); } @ApiOperation("获取商铺数据") @GetMapping("getShopListByShopNumber") - @ApiImplicitParam(name="shopNumber",value="shopNumber",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true) public ResultData getbshoplist(String shopNumber) { - return wxShopService.getbshoplist(getTenantId(),shopNumber); + return wxShopService.getbshoplist(getTenantId(), shopNumber); } @ApiOperation("获取商户商铺数据") @GetMapping("getMerchantShopByShopId") - @ApiImplicitParam(name="shopId",value="shopId",dataType="String", paramType = "query",required=true) + @ApiImplicitParam(name = "shopId", value = "shopId", dataType = "String", paramType = "query", required = true) public ResultData getMerchantShopByShopId(String shopId) { - return wxShopService.getMerchantShopByShopId(getTenantId(),shopId); + return wxShopService.getMerchantShopByShopId(getTenantId(), shopId); } - + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java index fc3bf247a..935f910ea 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java @@ -6,7 +6,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,16 +27,15 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxTags") @Api(description="标签弹窗接口") -public class WxTagsController extends BaseController -{ +public class WxTagsController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxTagsService wxTagsService; @Autowired private WxCUserTagsService wxCUserTagsService; - private Logger logger = Logger.getLogger(WxTagsController.class); - @GetMapping("getAllList") @ApiOperation("标签弹窗接口") public ResultData getAllList() { diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserChannelController.java index a986655c5..fa00d5424 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserChannelController.java @@ -1,41 +1,37 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxUserChannel; import com.simple.service.WxUserChannelService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxUserChannel") -public class WxUserChannelController extends BaseController -{ - @Autowired +public class WxUserChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxUserChannelService wxUserChannelService; - private Logger logger = Logger.getLogger(WxUserChannelController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxUserChannel wxUserChannel,Integer pageNum, Integer pageSize) { - if (null == wxUserChannel) wxUserChannel = new WxUserChannel(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxUserChannel wxUserChannel, Integer pageNum, Integer pageSize) { + if (null == wxUserChannel) wxUserChannel = new WxUserChannel(); final PageInfo page = wxUserChannelService.listAsPage(wxUserChannel, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxUserChannel wxUserChannel) { //Assert.notNull(wxUserChannel.getName(), "角色名不能为空"); @@ -53,19 +49,18 @@ public class WxUserChannelController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxUserChannelService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxUserChannelService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxUserChannelService.getById(id)); } - - - + + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java index cffbc4bf1..40ec0c4e6 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java @@ -5,6 +5,8 @@ import com.simple.common.ResultData; import com.simple.domain.dto.WxUserCouponDto; import com.simple.service.WxUserCouponService; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("wxUserCoupon") public class WxUserCouponController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserStructureController.java index 9dfbd9411..d917c6d62 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserStructureController.java @@ -1,20 +1,5 @@ package com.simple.controller; -import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; import com.simple.domain.dto.WxCUserBasicInfoDto; @@ -25,228 +10,235 @@ import com.simple.enums.EnumAgeInfo; import com.simple.service.WxCUserBasicInfoService; import com.simple.service.WxCUserService; import com.simple.service.WxUserChannelService; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.*; @RestController -@Api(description="会员洞察") +@Api(description = "会员洞察") @RequestMapping("userAnalysis") -public class WxUserStructureController extends BaseController{ - - @Autowired +public class WxUserStructureController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - - @Autowired - private WxCUserService wxCUserService; - @Autowired - private WxUserChannelService wxUserChannelService; - - @ApiOperation("查询会员性别结构") - @GetMapping("/findUserSexStructure") - public ResultData findUserSexStructure( - Date startTime,Date endTime - ) { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); - dto.setStartTime(startTime); - if(endTime!=null) { - Calendar c = Calendar.getInstance(); - c.setTime(endTime); - c.add(Calendar.DAY_OF_YEAR, 1); - endTime =c.getTime(); - } - //保密 - dto.setSex(0); - long secrecy = getCount(dto); - dto.setSex(1); - long boy = getCount(dto); - dto.setSex(2); - long girl=getCount(dto); - Long all =secrecy+boy+girl; - List vos = new ArrayList<>(); - vos.add(getVo(boy, all, "男",1)); - vos.add(getVo(girl, all, "女",2)); - vos.add(getVo(secrecy, all, "保密",3)); - return new ResultData(vos); - } - - @ApiOperation("查询会员年龄结构") - @GetMapping("/findUserAgeStructure") - public ResultData findUserAgeStructure( Date startTime,Date endTime) { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); - dto.setStartTime(startTime); - if(endTime!=null) { - Calendar c = Calendar.getInstance(); - c.setTime(endTime); - c.add(Calendar.DAY_OF_YEAR, 1); - endTime =c.getTime(); - } - dto.setEndTime(endTime); - long all =wxCUserBasicInfoService.findCountByAge(dto); - List vos = new ArrayList<>(); - Calendar c = Calendar.getInstance(); - for(EnumAgeInfo a:EnumAgeInfo.values()) { - c.clear(); - c.setTime(new Date()); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - long count = getCountByAge(a, c,dto); - vos.add(getVo(count, all, a.getDesc(),a.getSortNum())); - } - return new ResultData(vos); - } - - @ApiOperation("查询会员数量") - @GetMapping("/findUserDataCount") - public ResultData findUserCount(Date startTime,Date endTime) { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); - dto.setStartTime(startTime); - if(endTime!=null) { - Calendar c = Calendar.getInstance(); - c.setTime(endTime); - c.add(Calendar.DAY_OF_YEAR, 1); - endTime =c.getTime(); - } - long allCount = wxCUserService.findCount(dto);//总量 - - Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - Date today = c.getTime(); - dto.setStartTime(today); - dto.setEndTime(null); - long todayCount= wxCUserService.findCount( dto);//今天新增 - List newCountVos = new ArrayList<>();//每日新增会员数 - int j=1; - for(int i=29;i>=0;i--) { - c.clear(); - c.setTime(today); - c.add(Calendar.DAY_OF_YEAR, -i); - dto.setStartTime(c.getTime()); - c.add(Calendar.DAY_OF_YEAR, 1); - dto.setEndTime(c.getTime()); - long count= wxCUserService.findCount(dto); - UserStructureVo vo = new UserStructureVo(); - vo.setSortNum(j); - j++; - vo.setName(new SimpleDateFormat("MM-dd").format(dto.getStartTime())); - vo.setCount(count); - newCountVos.add(vo); - } - List allCountVos = new ArrayList<>();//累计会员数 - c.clear(); - c.setTime(today); - c.add(Calendar.DAY_OF_YEAR, -30); - dto.setEndTime(c.getTime()); - dto.setStartTime(null); - long firstDay = wxCUserService.findCount(dto);//统计的第一天总数 - int i =0; - long sumCount=0; - for(UserStructureVo v:newCountVos) { - UserStructureVo vo = new UserStructureVo(); - sumCount+=v.getCount(); - vo.setCount(firstDay+sumCount); - vo.setName(v.getName()); - vo.setSortNum(i+1); - allCountVos.add(vo); - i++; - } - Map map = new HashMap<>(); - map.put("allCount", allCount);//累计会员总数 - map.put("todayCount", todayCount);//今日新增会员数 - map.put("allCountVos", allCountVos);//累计会员列表（ 日期和数量list） - map.put("newCountVos", newCountVos);//新增会员列表（日期和数量list） - return new ResultData(map); - } - - @ApiOperation("拓客分析") - @GetMapping("/findUserByChannel") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData findUserByChannel(String channelName,Integer pageNum, Integer pageSize) { - List sceneList =null; - if(StringUtils.isNotBlank(channelName)) { - WxUserChannel c= new WxUserChannel(); - c.setChannelName(channelName); - PageInfo page = wxUserChannelService.listAsPage(c, 1, 100); - if(page.getSize()>0) { - sceneList = new ArrayList<>(); - for(WxUserChannel wuc:page.getList()) { - sceneList.add(wuc.getSceneAddress()); - } - } - } - PageInfo page = wxCUserService.listByChannel(sceneList, pageNum, pageSize); - for(WxCUser u:page.getList()) { - WxUserChannel c= new WxUserChannel(); - c.setSceneAddress(u.getSceneAddress()); - PageInfo uc = wxUserChannelService.listAsPage(c, 1, 1); - if(uc.getSize()>0) { - u.setChannelName(uc.getList().get(0).getChannelName()); - }else { - u.setChannelName("其他来源"); - } - } - - return new ResultData(page); - } - - @ApiOperation("获取用户所有渠道") - @GetMapping("/findAllUserChannel") - public ResultData findAllUserChannel() { - List channels=wxUserChannelService.findDistinctChannel(); - List vos = new ArrayList<>(); - for(WxUserChannel w:channels) { - vos.add(w.getChannelName()); - } - return new ResultData(vos); - } - - - private long getCountByAge(EnumAgeInfo a,Calendar c, WxCUserBasicInfoDto dto ) { - c.add(Calendar.YEAR, -a.getEnd()); - Date startTime = c.getTime(); - c.clear(); - c.setTime(startTime); - c.add(Calendar.YEAR,a.getEnd()-a.getStart()); - Date endTime = c.getTime(); - dto.setBirthStartTime(startTime); - dto.setBirthEndTime(endTime); - return wxCUserBasicInfoService.findCountByAge(dto); - } - - - - - //通过性别获取数量 - private long getCount(WxCUserBasicInfoDto dto) { - // wxCUserBasicInfoService.findCountBySex(dto) basic表与cuser表示对应的，先有cuser 才有basic - //所有这里不需要再去查basic - return wxCUserService.findCount(dto); - } - - private UserStructureVo getVo(long count,long all,String name,Integer num) { - UserStructureVo vo = new UserStructureVo(); - vo.setSortNum(num); - vo.setName(name); - vo.setCount(count); - NumberFormat nf = NumberFormat.getPercentInstance(); - nf.setMinimumFractionDigits(2);//控制保留小数点后几位，2：表示保留2位小数点 - if(all>0) { - vo.setPercentage(nf.format(new Long(count).doubleValue()/new Long(all).doubleValue())); - }else { - vo.setPercentage("0.00%"); - } - return vo; - } - + + @Autowired + private WxCUserService wxCUserService; + @Autowired + private WxUserChannelService wxUserChannelService; + + @ApiOperation("查询会员性别结构") + @GetMapping("/findUserSexStructure") + public ResultData findUserSexStructure(Date startTime, Date endTime) { + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.setTenantId(getTenantId()); + dto.setStartTime(startTime); + if (endTime != null) { + Calendar c = Calendar.getInstance(); + c.setTime(endTime); + c.add(Calendar.DAY_OF_YEAR, 1); + endTime = c.getTime(); + } + //保密 + dto.setSex(0); + long secrecy = getCount(dto); + dto.setSex(1); + long boy = getCount(dto); + dto.setSex(2); + long girl = getCount(dto); + Long all = secrecy + boy + girl; + List vos = new ArrayList<>(); + vos.add(getVo(boy, all, "男", 1)); + vos.add(getVo(girl, all, "女", 2)); + vos.add(getVo(secrecy, all, "保密", 3)); + return new ResultData(vos); + } + + @ApiOperation("查询会员年龄结构") + @GetMapping("/findUserAgeStructure") + public ResultData findUserAgeStructure(Date startTime, Date endTime) { + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.setTenantId(getTenantId()); + dto.setStartTime(startTime); + if (endTime != null) { + Calendar c = Calendar.getInstance(); + c.setTime(endTime); + c.add(Calendar.DAY_OF_YEAR, 1); + endTime = c.getTime(); + } + dto.setEndTime(endTime); + long all = wxCUserBasicInfoService.findCountByAge(dto); + List vos = new ArrayList<>(); + Calendar c = Calendar.getInstance(); + for (EnumAgeInfo a : EnumAgeInfo.values()) { + c.clear(); + c.setTime(new Date()); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + long count = getCountByAge(a, c, dto); + vos.add(getVo(count, all, a.getDesc(), a.getSortNum())); + } + return new ResultData(vos); + } + + @ApiOperation("查询会员数量") + @GetMapping("/findUserDataCount") + public ResultData findUserCount(Date startTime, Date endTime) { + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.setTenantId(getTenantId()); + dto.setStartTime(startTime); + if (endTime != null) { + Calendar c = Calendar.getInstance(); + c.setTime(endTime); + c.add(Calendar.DAY_OF_YEAR, 1); + endTime = c.getTime(); + } + long allCount = wxCUserService.findCount(dto);//总量 + + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + Date today = c.getTime(); + dto.setStartTime(today); + dto.setEndTime(null); + long todayCount = wxCUserService.findCount(dto);//今天新增 + List newCountVos = new ArrayList<>();//每日新增会员数 + int j = 1; + for (int i = 29; i >= 0; i--) { + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -i); + dto.setStartTime(c.getTime()); + c.add(Calendar.DAY_OF_YEAR, 1); + dto.setEndTime(c.getTime()); + long count = wxCUserService.findCount(dto); + UserStructureVo vo = new UserStructureVo(); + vo.setSortNum(j); + j++; + vo.setName(new SimpleDateFormat("MM-dd").format(dto.getStartTime())); + vo.setCount(count); + newCountVos.add(vo); + } + List allCountVos = new ArrayList<>();//累计会员数 + c.clear(); + c.setTime(today); + c.add(Calendar.DAY_OF_YEAR, -30); + dto.setEndTime(c.getTime()); + dto.setStartTime(null); + long firstDay = wxCUserService.findCount(dto);//统计的第一天总数 + int i = 0; + long sumCount = 0; + for (UserStructureVo v : newCountVos) { + UserStructureVo vo = new UserStructureVo(); + sumCount += v.getCount(); + vo.setCount(firstDay + sumCount); + vo.setName(v.getName()); + vo.setSortNum(i + 1); + allCountVos.add(vo); + i++; + } + Map map = new HashMap<>(); + map.put("allCount", allCount);//累计会员总数 + map.put("todayCount", todayCount);//今日新增会员数 + map.put("allCountVos", allCountVos);//累计会员列表（ 日期和数量list） + map.put("newCountVos", newCountVos);//新增会员列表（日期和数量list） + return new ResultData(map); + } + + @ApiOperation("拓客分析") + @GetMapping("/findUserByChannel") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findUserByChannel(String channelName, Integer pageNum, Integer pageSize) { + List sceneList = null; + if (StringUtils.isNotBlank(channelName)) { + WxUserChannel c = new WxUserChannel(); + c.setChannelName(channelName); + PageInfo page = wxUserChannelService.listAsPage(c, 1, 100); + if (page.getSize() > 0) { + sceneList = new ArrayList<>(); + for (WxUserChannel wuc : page.getList()) { + sceneList.add(wuc.getSceneAddress()); + } + } + } + PageInfo page = wxCUserService.listByChannel(sceneList, pageNum, pageSize); + for (WxCUser u : page.getList()) { + WxUserChannel c = new WxUserChannel(); + c.setSceneAddress(u.getSceneAddress()); + PageInfo uc = wxUserChannelService.listAsPage(c, 1, 1); + if (uc.getSize() > 0) { + u.setChannelName(uc.getList().get(0).getChannelName()); + } else { + u.setChannelName("其他来源"); + } + } + + return new ResultData(page); + } + + @ApiOperation("获取用户所有渠道") + @GetMapping("/findAllUserChannel") + public ResultData findAllUserChannel() { + List channels = wxUserChannelService.findDistinctChannel(); + List vos = new ArrayList<>(); + for (WxUserChannel w : channels) { + vos.add(w.getChannelName()); + } + return new ResultData(vos); + } + + + private long getCountByAge(EnumAgeInfo a, Calendar c, WxCUserBasicInfoDto dto) { + c.add(Calendar.YEAR, -a.getEnd()); + Date startTime = c.getTime(); + c.clear(); + c.setTime(startTime); + c.add(Calendar.YEAR, a.getEnd() - a.getStart()); + Date endTime = c.getTime(); + dto.setBirthStartTime(startTime); + dto.setBirthEndTime(endTime); + return wxCUserBasicInfoService.findCountByAge(dto); + } + + + //通过性别获取数量 + private long getCount(WxCUserBasicInfoDto dto) { + // wxCUserBasicInfoService.findCountBySex(dto) basic表与cuser表示对应的，先有cuser 才有basic + //所有这里不需要再去查basic + return wxCUserService.findCount(dto); + } + + private UserStructureVo getVo(long count, long all, String name, Integer num) { + UserStructureVo vo = new UserStructureVo(); + vo.setSortNum(num); + vo.setName(name); + vo.setCount(count); + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMinimumFractionDigits(2);//控制保留小数点后几位，2：表示保留2位小数点 + if (all > 0) { + vo.setPercentage(nf.format(new Long(count).doubleValue() / new Long(all).doubleValue())); + } else { + vo.setPercentage("0.00%"); + } + return vo; + } + } From bd8fdb72bd38e5e88fed5bd8a7e7397acfb57996 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 11:48:31 +0800 Subject: [PATCH 09/40] =?UTF-8?q?[=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E5=AF=86][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/java/com/simple/UserApplication.java | 2 ++ mallinkAdmin/src/main/resources/application-dev.yml | 6 +++--- mallinkAdmin/src/main/resources/application.yml | 6 +++++- mallinkBApi/src/main/java/com/simple/BApplication.java | 2 ++ mallinkBApi/src/main/resources/application-dev.yml | 6 +++--- mallinkBApi/src/main/resources/application.yml | 6 +++++- mallinkCApi/src/main/java/com/simple/CApplication.java | 3 ++- mallinkCApi/src/main/resources/application-dev.yml | 6 +++--- mallinkCApi/src/main/resources/application.yml | 4 ++++ pom.xml | 6 ++++++ 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/UserApplication.java b/mallinkAdmin/src/main/java/com/simple/UserApplication.java index a16a60136..3dfeddf2d 100644 --- a/mallinkAdmin/src/main/java/com/simple/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/simple/UserApplication.java @@ -1,5 +1,6 @@ package com.simple; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 +@EnableEncryptableProperties public class UserApplication { public static void main(String[] args) { diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 86cf4f4c0..dad59fbfa 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -2,8 +2,8 @@ spring: # JDBC datasource: url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false - username: mallone - password: m@1l0ne123@# + username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) + password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) type: com.alibaba.druid.pool.DruidDataSource driver_class: com.mysql.cj.jdbc.Driver filters: stat @@ -27,7 +27,7 @@ spring: redis: host: 202.165.179.86 port: 6789 - password: JGtest123 + password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) timeout: 0 expire: 1800 #30分钟 pool: diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index d0ab85172..1dd9ee252 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -39,4 +39,8 @@ mapper: - com.simple.common.CommonMapper pay: - real: true \ No newline at end of file + real: true + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/simple/BApplication.java b/mallinkBApi/src/main/java/com/simple/BApplication.java index 0b399ffbd..cf5173e3c 100644 --- a/mallinkBApi/src/main/java/com/simple/BApplication.java +++ b/mallinkBApi/src/main/java/com/simple/BApplication.java @@ -1,5 +1,6 @@ package com.simple; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 +@EnableEncryptableProperties public class BApplication { public static void main(String[] args) { diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index eb2ea3414..5ba19fccd 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -2,8 +2,8 @@ spring: # JDBC datasource: url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false - username: mallone - password: m@1l0ne123@# + username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) + password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) type: com.alibaba.druid.pool.DruidDataSource driver_class: com.mysql.cj.jdbc.Driver filters: stat @@ -26,7 +26,7 @@ spring: redis: host: 202.165.179.86 port: 6789 - password: JGtest123 + password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) timeout: 0 expire: 1800 #30分钟 pool: diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index 663167d37..e4092a2d9 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -39,4 +39,8 @@ mapper: - com.simple.common.CommonMapper pay: - real: true \ No newline at end of file + real: true + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/simple/CApplication.java b/mallinkCApi/src/main/java/com/simple/CApplication.java index c9e810cd4..cdb45268f 100644 --- a/mallinkCApi/src/main/java/com/simple/CApplication.java +++ b/mallinkCApi/src/main/java/com/simple/CApplication.java @@ -1,5 +1,6 @@ package com.simple; +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,7 +13,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; */ @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) - +@EnableEncryptableProperties public class CApplication { public static void main(String[] args) { diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index eb2ea3414..5ba19fccd 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -2,8 +2,8 @@ spring: # JDBC datasource: url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false - username: mallone - password: m@1l0ne123@# + username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) + password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) type: com.alibaba.druid.pool.DruidDataSource driver_class: com.mysql.cj.jdbc.Driver filters: stat @@ -26,7 +26,7 @@ spring: redis: host: 202.165.179.86 port: 6789 - password: JGtest123 + password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco) timeout: 0 expire: 1800 #30分钟 pool: diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index 6f51968a0..c12fd23de 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -40,3 +40,7 @@ mapper: pay: real: true + +jasypt: + encryptor: + password: oRqdnDbK5pj3eMmB \ No newline at end of file diff --git a/pom.xml b/pom.xml index 519bede6a..c144744be 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,12 @@ ${weixin-java-miniapp.version} + + com.github.ulisesbocchio + jasypt-spring-boot + 2.0.0 + + From 1c1213f8be55eb54ac1a5c957b8ceb12cd261a0a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 8 Sep 2018 14:22:37 +0800 Subject: [PATCH 10/40] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0]=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 28 ++ .../simple/domain/po/WxCUserBasicInfo.java | 14 +- .../service/WxCUserBasicInfoService.java | 10 + .../impl/WxCUserBasicInfoServiceImpl.java | 254 +++++++++++++++++- 4 files changed, 299 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index bfc6c5c2b..96330a6da 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -7,6 +7,7 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.dto.WxCUserBasicInfoDto; import com.simple.domain.po.*; +import com.simple.exception.MallinkException; import com.simple.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,8 +17,12 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -189,5 +194,28 @@ public class WxCUserBasicInfoController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", page); } + @RequestMapping("/exportData") + public void exportData(HttpServletRequest request, HttpServletResponse response){ + + wxCUserBasicInfoService.exportData(request,response,getTenantId()); + + } + + @RequestMapping("/exportTemplate") + public void exportTemplate(HttpServletRequest request, HttpServletResponse response){ + + wxCUserBasicInfoService.exportTemplate(request,response,getTenantId()); + + } + + @Transactional + @RequestMapping("/importTemplate") + public ResultData importTemplate(@RequestParam("file") MultipartFile file){ + if (file.isEmpty()) { + throw new MallinkException(500,"上传文件不能为空"); + } + return wxCUserBasicInfoService.importTemplate(file,getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java index c65e1ec8b..180948877 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -1,12 +1,13 @@ package com.simple.domain.po; -import java.io.Serializable; -import java.util.Date; -import java.util.List; +import cn.afterturn.easypoi.excel.annotation.Excel; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_c_user_basic_info") public class WxCUserBasicInfo implements Serializable { @@ -43,15 +44,19 @@ public class WxCUserBasicInfo implements Serializable { /*微信用户绑定的手机号**/ + @Excel(name="手机",width = 20,orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="微信用户绑定的手机号",name="phone") private String phone; /*出生日期**/ + @Excel(name="生日",width = 20,format="yyyy-MM-dd",orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") private Date birthdate; /*学历**/ + @Excel(name="学历",width = 20,orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="学历",name="education") private String education; /*性别：0：保密 1.男 2女**/ + @Excel(name="性别",width = 20,replace = { "保密_0", "男_1","女_2"},orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="性别：0：保密 1.男 2女",name="sex") private Integer sex; /*邮箱**/ @@ -75,8 +80,9 @@ public class WxCUserBasicInfo implements Serializable { /*租户id**/ @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - + /*用户姓名**/ + @Excel(name="姓名",width = 20) @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java index 21a67586d..b8adeacbd 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java @@ -1,9 +1,13 @@ package com.simple.service; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.dto.WxCUserBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Map; public interface WxCUserBasicInfoService { @@ -67,4 +71,10 @@ public interface WxCUserBasicInfoService { PageInfo> queryListMap(WxCUserBasicInfoDto wxCUserBasicInfo, Integer pageNum, Integer pageSize); + void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId); + + void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId); + + ResultData importTemplate(MultipartFile file, String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index ea3400f38..228614175 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,18 +1,34 @@ package com.simple.service.impl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.IdWorker; +import com.simple.common.Result; +import com.simple.common.ResultData; import com.simple.domain.dto.WxCUserBasicInfoDto; +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCUserBasicInfo; +import com.simple.exception.MallinkException; import com.simple.mapper.WxCUserBasicInfoMapper; +import com.simple.mapper.WxCUserMapper; import com.simple.service.WxCUserBasicInfoService; +import org.apache.commons.io.FileUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.util.List; import java.util.Map; +import java.util.UUID; @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -20,6 +36,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; + @Autowired + WxCUserMapper wxCUserMapper; @Override public PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize) { @@ -83,5 +101,235 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findListMap(record)); } + @Override + public void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId) { + + + WxCUser wxCUser = new WxCUser(); + wxCUser.setTenantId(tenantId); + List userlist = wxCUserMapper.findList(wxCUser); + + WxCUserBasicInfoDto basicInfoDto = new WxCUserBasicInfoDto(); + basicInfoDto.setTenantId(tenantId); + List memberlist = wxCUserBasicInfoMapper.list(basicInfoDto); + + + XSSFWorkbook workbook; + String filepath="./uploads/"; + File savefile = new File(filepath); + if (!savefile.exists()) { + savefile.mkdirs(); + } + String filename=UUID.randomUUID()+".xlsx"; + filepath=filepath+filename; + try { + File file=new File(filepath); + workbook=new XSSFWorkbook(); + XSSFSheet sheetOne = workbook.createSheet("微信关注用户"); + Row row = sheetOne.createRow(0); + Cell openIdCell = row.createCell(0); + Cell nickNameCell = row.createCell(1); + Cell phoneCell = row.createCell(2); + Cell genderCell = row.createCell(3); + Cell cityCell = row.createCell(4); + Cell provinceCell = row.createCell(5); + Cell languageCell = row.createCell(6); + Cell countryCodeCell = row.createCell(7); + Cell registerIpCell = row.createCell(8); + Cell sceneadressCell = row.createCell(9); + + openIdCell.setCellValue("openId"); + nickNameCell.setCellValue("昵称"); + phoneCell.setCellValue("手机"); + genderCell.setCellValue("性别"); + cityCell.setCellValue("城市"); + provinceCell.setCellValue("省份"); + languageCell.setCellValue("语言"); + countryCodeCell.setCellValue("国家代码"); + registerIpCell.setCellValue("注册IP"); + sceneadressCell.setCellValue("场景值"); + + + for(int i=0;i 0) + response.getOutputStream().write(b, 0, len); + inStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { + + XSSFWorkbook workbook; + String filepath="./uploads/"; + File savefile = new File(filepath); + if (!savefile.exists()) { + savefile.mkdirs(); + } + String filename=UUID.randomUUID()+".xlsx"; + filepath=filepath+filename; + try { + File file=new File(filepath); + workbook=new XSSFWorkbook(); + + XSSFSheet sheetTwo = workbook.createSheet("会员信息"); + Row rowtwo = sheetTwo.createRow(0); + Cell nameCellTwo = rowtwo.createCell(0); + Cell phoneCellTwo = rowtwo.createCell(1); + Cell sexCellTwo = rowtwo.createCell(2); + Cell birthdateCellTwo = rowtwo.createCell(3); + Cell educationCellTwo = rowtwo.createCell(4); + + nameCellTwo.setCellValue("姓名"); + phoneCellTwo.setCellValue("手机"); + sexCellTwo.setCellValue("性别"); + birthdateCellTwo.setCellValue("生日"); + educationCellTwo.setCellValue("学历"); + + FileOutputStream fileOut = new FileOutputStream(file); + workbook.write(fileOut); + fileOut.close(); + workbook.close(); + downFile(filepath,filename,response,request); + FileUtils.forceDelete(file); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + @Override + public ResultData importTemplate(MultipartFile file, String tenantId) { + + try { + + ImportParams params = new ImportParams(); + params.setTitleRows(1); + params.setHeadRows(1); + List datalist = ExcelImportUtil.importExcel(file.getInputStream(),WxCUserBasicInfo.class, params); + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setTenantId(tenantId); + List list = wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); + final IdWorker idWorker = IdWorker.get(); + for(WxCUserBasicInfo user:datalist){ + WxCUserBasicInfo tempuser = list.stream().filter(u -> u.getPhone().equals(user.getPhone())).findFirst().get(); + if(tempuser!=null){ + tempuser.setSex(user.getSex()); + tempuser.setEducation(user.getEducation()); + tempuser.setBirthdate(user.getBirthdate()); + tempuser.setName(user.getName()); + wxCUserBasicInfoMapper.updateByPrimaryKeySelective(tempuser); + } else { + user.setId(idWorker.nextId()); + wxCUserBasicInfoMapper.insertSelective(user); + } + } + + } catch (Exception e) { + throw new MallinkException(500,"模板导入失败"); + } + + return new ResultData(Result.SUCCESS,"导入成功"); + } + + } From 21196e9aceae1800655cca0120fe0b6fb5539f2f Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 14:32:56 +0800 Subject: [PATCH 11/40] =?UTF-8?q?[=E9=A2=91=E9=81=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=B9=E9=87=8F][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxChannel.java | 22 ++++++++++++++----- .../main/resources/mapper/WxChannelMapper.xml | 8 +++++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java index 5a20ac9da..85f3c6eb0 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java @@ -41,15 +41,18 @@ public class WxChannel implements Serializable { - /*渠道ID**/ + /**渠道ID**/ @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="channelId") private Integer channelId; - /*渠道名**/ + /**渠道名**/ @io.swagger.annotations.ApiModelProperty(value="渠道名",name="title") private String title; - /*图片url**/ + /**图片url**/ @io.swagger.annotations.ApiModelProperty(value="图片url",name="img") private String img; + /**是否支持批量投放**/ + @io.swagger.annotations.ApiModelProperty(value="是否支持批量投放0:不支持，1：支持",name="batch") + private boolean batch; public Integer getChannelId() { return channelId; } @@ -69,14 +72,21 @@ public class WxChannel implements Serializable { img = _img; } + public boolean isBatch() { + return batch; + } + public void setBatch(boolean batch) { + this.batch = batch; + } public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ChannelId_ASC("`channel_id` ASC"),ChannelId_DESC("`channel_id` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,Img_ASC("`img` ASC"),Img_DESC("`img` DESC") + ,ChannelId_ASC("`channel_id` ASC"),ChannelId_DESC("`channel_id` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,Img_ASC("`img` ASC"),Img_DESC("`img` DESC") + ,Batch_ASC("`batch` ASC"),atch_DESC("`batch` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/resources/mapper/WxChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxChannelMapper.xml index 28bf27c11..d5badeed7 100644 --- a/mallinkService/src/main/resources/mapper/WxChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxChannelMapper.xml @@ -6,10 +6,11 @@ + - `id`,`channel_id`,`title`,`img` + `id`,`channel_id`,`title`,`img`,`batch` @@ -29,7 +30,10 @@ and `img` like concat('%', #{img},'%') - + + + and `batch` = #{batch} + and id in From a2efd6b54c76351f802a8fb46a45b11ae0f67c90 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 14:33:34 +0800 Subject: [PATCH 12/40] =?UTF-8?q?[AWS=20S3][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/config/AwsProperty.java | 52 +++++++++++ .../simple/controller/UploadController.java | 92 ++++++++++++++++++- .../src/main/resources/application.yml | 9 +- pom.xml | 18 ++-- 4 files changed, 156 insertions(+), 15 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/config/AwsProperty.java diff --git a/mallinkAdmin/src/main/java/com/simple/config/AwsProperty.java b/mallinkAdmin/src/main/java/com/simple/config/AwsProperty.java new file mode 100644 index 000000000..2fcae3309 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/config/AwsProperty.java @@ -0,0 +1,52 @@ +package com.simple.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author Stormeye + */ +@Component +@ConfigurationProperties(prefix = "aws") +public class AwsProperty { + // AWS ACCESS KEY + private String access; + + private String secret; + + private String clientRegion; + + private String bucketName; + + public String getAccess() { + return access; + } + + public void setAccess(String access) { + this.access = access; + } + + public String getSecret() { + return secret; + } + + public void setSecret(String secret) { + this.secret = secret; + } + + public String getClientRegion() { + return clientRegion; + } + + public void setClientRegion(String clientRegion) { + this.clientRegion = clientRegion; + } + + public String getBucketName() { + return bucketName; + } + + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index 9b9183390..bdb965383 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -1,11 +1,24 @@ package com.simple.controller; +import com.amazonaws.AmazonClientException; +import com.amazonaws.AmazonServiceException; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import com.amazonaws.services.s3.model.CannedAccessControlList; +import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; +import com.amazonaws.services.s3.model.ObjectMetadata; +import com.amazonaws.services.s3.model.PutObjectRequest; import com.simple.common.ResultData; +import com.simple.config.AwsProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,6 +30,7 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.net.URL; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -34,6 +48,9 @@ public class UploadController { @Value("${fileUpload.server}") private String server; + @Autowired + private AwsProperty awsProperty; + /** * 上传文件 * @@ -41,8 +58,7 @@ public class UploadController { * @return * @throws Exception */ - @PostMapping(value = "/fileUpload", consumes = "multipart/*" - , headers = "content-type=multipart/form-data") + @PostMapping(value = "/fileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传文件") public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq) { ResultData data = new ResultData(); @@ -94,5 +110,77 @@ public class UploadController { return data; } + /** + * 上传文件 + * + * @param multiReq + * @return + * @throws Exception + */ + @PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") + @ApiOperation("上传文件") + public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) { + ResultData data = new ResultData(); + + + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(multiReq.getContentType()); + metadata.setContentLength(multiReq.getSize()); + + FileOutputStream fos = null; + BufferedInputStream fs = null; + try { + AmazonS3 s3 = AmazonS3ClientBuilder.standard() + .withRegion(awsProperty.getClientRegion()) + .withCredentials(new AWSCredentialsProvider() { + @Override + public AWSCredentials getCredentials() { + return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); + } + + @Override + public void refresh() { + + } + }) + .build(); + String fileName = UUID.randomUUID().toString(); + int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + fileName = fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + + s3.putObject( + new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) + .withCannedAcl(CannedAccessControlList.PublicRead)); + GeneratePresignedUrlRequest urlRequest = new GeneratePresignedUrlRequest(awsProperty.getBucketName(), fileName); + URL url = s3.generatePresignedUrl(urlRequest); + logger.info(url.toString()); + + data.code = ResultData.SUCCESS; + Map map = new HashMap<>(); + map.put("imgarray", url.toString()); + data.data = map; + return data; + } catch (AmazonServiceException ase) { + data.code = ResultData.ERROR; + logger.warn("Caught an AmazonServiceException, which " + + "means your request made it " + + "to Amazon S3, but was rejected with an error response" + + " for some reason."); + logger.warn(ase.getMessage()); + } catch (AmazonClientException ace) { + data.code = ResultData.ERROR; + logger.warn("Caught an AmazonClientException, which " + + "means the client encountered " + + "an internal error while trying to " + + "communicate with S3, " + + "such as not being able to access the network."); + logger.warn("Error Message: " + ace.getMessage()); + } catch (IOException ioe) { + data.code = ResultData.ERROR; + logger.warn("Caught an IOException: " + ioe.getMessage()); + } + return data; + } + } diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 1dd9ee252..73bc01b48 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -41,6 +41,13 @@ mapper: pay: real: true +aws: + clientRegion: cn-northwest-1 + bucketName: iformall-net + access: ENC(JpCzY0EvZlTva/X1wV35titi7TkOBrEc) + secret: ENC(XHn5A00zfLMjycZFFROy/CjWR11gqE8jt70PZFdVq7biALtcqou5Xw6lfkqFvkpG2HCV8UkCsvpY1fPivFAaXF54gvmuGwie) + jasypt: encryptor: - password: oRqdnDbK5pj3eMmB \ No newline at end of file + password: oRqdnDbK5pj3eMmB + diff --git a/pom.xml b/pom.xml index c144744be..c59cd5ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,18 +28,6 @@ 3.1.0 - - - - com.amazonaws - aws-java-sdk-bom - 1.11.404 - pom - import - - - - org.springframework.boot @@ -246,6 +234,12 @@ 2.0.0 + + com.amazonaws + aws-java-sdk + 1.11.404 + + From 7b30cb11c948566b48c5c5f4eef8c2dcf4ba20e0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 14:56:23 +0800 Subject: [PATCH 13/40] =?UTF-8?q?[=E9=A2=91=E9=81=93batch=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxChannel.java | 267 +++++++++--------- 1 file changed, 137 insertions(+), 130 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java index 85f3c6eb0..751446cd5 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java @@ -1,143 +1,150 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; @Table(name = "wx_channel") public class WxChannel implements Serializable { - private static final long serialVersionUID = 1L; - - @Id + private static final long serialVersionUID = 1L; + + @Id protected Long id; - + @Transient protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /**渠道ID**/ - @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="channelId") - private Integer channelId; - /**渠道名**/ - @io.swagger.annotations.ApiModelProperty(value="渠道名",name="title") - private String title; - /**图片url**/ - @io.swagger.annotations.ApiModelProperty(value="图片url",name="img") - private String img; - /**是否支持批量投放**/ - @io.swagger.annotations.ApiModelProperty(value="是否支持批量投放0:不支持，1：支持",name="batch") - private boolean batch; - public Integer getChannelId() { - return channelId; - } - public void setChannelId(Integer _channelId) { - channelId = _channelId; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public String getImg() { - return img; - } - public void setImg(String _img) { - img = _img; - } - - public boolean isBatch() { - return batch; - } - - public void setBatch(boolean batch) { - this.batch = batch; - } - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ChannelId_ASC("`channel_id` ASC"),ChannelId_DESC("`channel_id` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,Img_ASC("`img` ASC"),Img_DESC("`img` DESC") - ,Batch_ASC("`batch` ASC"),atch_DESC("`batch` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxChannel.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - this.sortColumns = sb.toString(); - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + /** + * 渠道ID + **/ + @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") + private Integer channelId; + /** + * 渠道名 + **/ + @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") + private String title; + /** + * 图片url + **/ + @io.swagger.annotations.ApiModelProperty(value = "图片url", name = "img") + private String img; + /** + * 是否支持批量投放 + **/ + @io.swagger.annotations.ApiModelProperty(value = "是否支持批量投放0:不支持，1：支持", name = "batch") + private Integer batch; + + public Integer getChannelId() { + return channelId; + } + + public void setChannelId(Integer _channelId) { + channelId = _channelId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String _title) { + title = _title; + } + + public String getImg() { + return img; + } + + public void setImg(String _img) { + img = _img; + } + + public Integer getBatch() { + return batch; + } + + public void setBatch(Integer batch) { + this.batch = batch; + } + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), ChannelId_ASC("`channel_id` ASC"), ChannelId_DESC("`channel_id` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), Img_ASC("`img` ASC"), Img_DESC("`img` DESC"), Batch_ASC("`batch` ASC"), atch_DESC("`batch` DESC"); + private String value; + + Field(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setCol(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxChannel.Field... fields) { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + this.sortColumns = sb.toString(); + + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } } From e1fe9ec42365c184689565b4dc00d00b3d2cfda8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 8 Sep 2018 16:57:18 +0800 Subject: [PATCH 14/40] =?UTF-8?q?[=E5=95=86=E6=88=B7=E5=95=86=E9=93=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=B8=9A=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxMerchant.java | 13 ++++ .../service/impl/WxMerchantServiceImpl.java | 61 ++++++++++++++++--- .../resources/mapper/WxRentContractMapper.xml | 2 +- .../main/resources/mapper/WxShopMapper.xml | 4 +- 4 files changed, 69 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 1501524c4..9206e5aec 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -61,6 +61,10 @@ public class WxMerchant implements Serializable { @Transient private BigDecimal price; + /*单价**/ + @Transient + private Integer receivePeriod; + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -215,6 +219,15 @@ public class WxMerchant implements Serializable { this.price = price; } + + public Integer getReceivePeriod() { + return receivePeriod; + } + + public void setReceivePeriod(Integer receivePeriod) { + this.receivePeriod = receivePeriod; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index d6fed2f2c..db98268cc 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -11,12 +11,10 @@ import com.simple.service.WxMerchantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import sun.util.resources.CalendarData; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -75,6 +73,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantShop.setIsDel(0); List shops = new ArrayList<>(); + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.setMerchantId(id); + List list = wxRentContractMapper.findList(wxRentContract); + if(list.size()>0){ + wxRentContract=list.get(0); + wxMerchant.setPrice(wxRentContract.getPrice()); + wxMerchant.setReceivePeriod(wxRentContract.getReceivePeriod()); + } + List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); for(WxMerchantShop merchantShop:wxMerchantShopList){ wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); @@ -127,16 +134,24 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setCreateDate(date); wxMerchantMapper.insertSelective(wxMerchant); + + WxShop wxShopP = new WxShop(); + wxShopP.setId(wxMerchant.getShopids().get(0)); + wxShopP = WxShopMapper.findList(wxShopP).get(0); + WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setMerchantId(merchantid); wxRentContract.setRentalStartDate(wxMerchant.getRentalStartDate()); wxRentContract.setRentalEndDate(wxMerchant.getRentalEndDate()); wxRentContract.setPrice(wxMerchant.getPrice()); wxRentContract.setSignDate(date); - wxRentContract.setPayArea(new BigDecimal(0)); - wxRentContract.setReceivePeriod(0); + + wxRentContract.setPayArea(new BigDecimal(wxShopP.getOperationArea())); + wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); wxRentContractMapper.insertSelective(wxRentContract); + buildRent(wxRentContract); + //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids(); for(Long shopid:shopidlist){ @@ -185,13 +200,17 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setUpdateDate(date); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + WxShop wxShopP = new WxShop(); + wxShopP.setId(wxMerchant.getShopids().get(0)); + wxShopP = WxShopMapper.findList(wxShopP).get(0); + WxRentContract wxRentContract = wxRentContractMapper.findObjectByMerchantId(wxMerchant.getId()); wxRentContract.setRentalStartDate(wxMerchant.getRentalStartDate()); wxRentContract.setRentalEndDate(wxMerchant.getRentalEndDate()); wxRentContract.setPrice(wxMerchant.getPrice()); wxRentContract.setSignDate(date); - wxRentContract.setPayArea(new BigDecimal(0)); - wxRentContract.setReceivePeriod(0); + wxRentContract.setPayArea(new BigDecimal(wxShopP.getOperationArea())); + wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); //删除当前商户关联的所有商铺然后再插入 @@ -278,5 +297,31 @@ public class WxMerchantServiceImpl implements WxMerchantService { } + private void buildRent(WxRentContract wxRentContract) { + + Date rentalStartDate = wxRentContract.getRentalStartDate(); + Date rentalEndDate = wxRentContract.getRentalEndDate(); + Integer receivePeriod = wxRentContract.getReceivePeriod(); + + int paycount = 12 / receivePeriod.intValue(); + + if(paycount==1){//12 + Calendar instance = Calendar.getInstance(); + instance.setTime(rentalStartDate); + instance.set(Calendar.MONTH,1); + } + if(paycount==2){//6 + + } + if(paycount==4){//3 + + } + if(paycount==12){//1 + + } + + + } + } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e9a1cdf71..cabdaa0cd 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -13,7 +13,7 @@ - `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`pay_area`,`receive_pay` + `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`pay_area`,`receive_period` diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 327c0f053..6b6d3d800 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -128,8 +128,8 @@ select s.id,s.shop_number shopNumber,s.build_area buildArea, s.img_url imgUrl,s.operation_area operationArea, s.status,b.building_name building,f.floor_name floor,m.`name` merchantName - from wx_shop s inner join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 - inner join wx_merchant m on ms.merchant_id=m.id + from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 + left join wx_merchant m on ms.merchant_id=m.id left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id From dd683e6999244a942b36d638f17162889ea2904d Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 16:54:27 +0800 Subject: [PATCH 15/40] =?UTF-8?q?[AWS=E8=AE=BE=E7=BD=AE][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 73bc01b48..7eeac4c96 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -44,8 +44,8 @@ pay: aws: clientRegion: cn-northwest-1 bucketName: iformall-net - access: ENC(JpCzY0EvZlTva/X1wV35titi7TkOBrEc) - secret: ENC(XHn5A00zfLMjycZFFROy/CjWR11gqE8jt70PZFdVq7biALtcqou5Xw6lfkqFvkpG2HCV8UkCsvpY1fPivFAaXF54gvmuGwie) + access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) + secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) jasypt: encryptor: From b64970aa666ae6a7e9c7e35e7167ee5b83bfe7fc Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 8 Sep 2018 16:34:32 +0800 Subject: [PATCH 16/40] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=95?= =?UTF-8?q?=E6=94=BE][=E4=BF=AE=E6=94=B9]=20=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponSendController.java | 6 ++++++ .../src/main/resources/mapper/WxCouponSendMapper.xml | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index 112664b0c..a5d994a7a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -47,9 +47,15 @@ public class WxCouponSendController extends BaseController { } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(0); +<<<<<<< HEAD List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { return new ResultData(Result.ERROR, "已经添加过该券"); +======= + List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); + if(wxCouponSendList!=null&&wxCouponSendList.size()>0){ + return new ResultData(Result.ERROR,"已经添加过该券"); +>>>>>>> 5607026... [小程序投放][修改] 返回错误列表 } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 27a4be553..66546993c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -72,10 +72,6 @@ and `send_end_time` = #{sendEndTime} - - and `send_end_time` >= NOW() - and `send_start_time` <= NOW() - and `create_date` = #{createDate} From 7a0fb003d49a47990c7c97082782a7839a2a34a6 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 17:25:01 +0800 Subject: [PATCH 17/40] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=95?= =?UTF-8?q?=E6=94=BE][=E4=BF=AE=E6=94=B9]=20=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponSendController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index a5d994a7a..112664b0c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -47,15 +47,9 @@ public class WxCouponSendController extends BaseController { } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(0); -<<<<<<< HEAD List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { return new ResultData(Result.ERROR, "已经添加过该券"); -======= - List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); - if(wxCouponSendList!=null&&wxCouponSendList.size()>0){ - return new ResultData(Result.ERROR,"已经添加过该券"); ->>>>>>> 5607026... [小程序投放][修改] 返回错误列表 } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) { From f590dc52a244f8e7cc41780be47a42b25129c1db Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 17:28:15 +0800 Subject: [PATCH 18/40] =?UTF-8?q?[merchant][=E5=88=A0=E9=99=A4]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/service/impl/WxMerchantServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index db98268cc..36b0e342b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -11,7 +11,6 @@ import com.simple.service.WxMerchantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.util.resources.CalendarData; import java.math.BigDecimal; import java.util.*; From bde9f8f49c7324b99a0cdfceeb92fe39969b1902 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 17:31:34 +0800 Subject: [PATCH 19/40] =?UTF-8?q?[=E5=8F=91=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?merge=20from=20=E5=85=83=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/WxCouponSendController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index 112664b0c..09c131ee8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -48,7 +48,7 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setStatus(0); List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); - if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { + if (wxCouponSendList != null && wxCouponSendList.size() > 0) { return new ResultData(Result.ERROR, "已经添加过该券"); } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); From 799500ec61f079cb827e36b2a68141d3c731e1b6 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 17:38:58 +0800 Subject: [PATCH 20/40] =?UTF-8?q?[=E5=8F=91=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?merge=20from=20=E5=85=83=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/vo/WxCouponChannelAddVo.java | 1 + .../com/simple/service/impl/WxCouponChannelServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java index c19e7125f..ca4b8e294 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java @@ -20,6 +20,7 @@ public class WxCouponChannelAddVo implements Serializable { this.couponId = wxCoupon.getId(); this.title = wxCoupon.getTitle(); this.validEndDate = wxCoupon.getValidEndDate(); + this.channelId = channelId; return this; } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index 6cac84d3b..fbba9611d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -85,7 +85,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { if(result) { return new ResultData(errorList); }else { - return new ResultData(Result.ERROR,"请检查券的有效期以及投放截止时间",errorList); + return new ResultData(Result.SUCCESS,"请检查券的有效期以及投放截止时间",errorList); } From eb5fc7644d9f467b9c3c181a210140e38dba6989 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 8 Sep 2018 20:44:49 +0800 Subject: [PATCH 21/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E8=B4=A6=E8=B4=A6=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9C=A8merchantPO=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxMerchant.java | 38 +++++++++++++++++++ .../enums/EnumProfitSharingReceiverType.java | 8 ++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 9206e5aec..56478ad81 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -65,6 +65,19 @@ public class WxMerchant implements Serializable { @Transient private Integer receivePeriod; + /*账户类型**/ + @Transient + private Integer accountTypeValue; + + /*账户ID**/ + @Transient + private String accountId; + + /*账户名**/ + @Transient + private String accountName; + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -228,6 +241,31 @@ public class WxMerchant implements Serializable { this.receivePeriod = receivePeriod; } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public Integer getAccountTypeValue() { + return accountTypeValue; + } + + public void setAccountTypeValue(Integer accountTypeValue) { + this.accountTypeValue = accountTypeValue; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java index 09fa151da..15224d9e8 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java @@ -4,10 +4,10 @@ package com.simple.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumProfitSharingReceiverType { - PROFIT_SHARING_RECEIVER_MERCHANT_ID(1, "MERCHANT_ID"), - PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID(2, "PERSONAL_WECHATID"), - PROFIT_SHARING_RECEIVER_PERSONAL_OPENID(3, "PERSONAL_OPENID"), - PROFIT_SHARING_RECEIVER_PERSONAL_SUB_OPENID(4, "PERSONAL_SUB_OPENID"), + PROFIT_SHARING_RECEIVER_MERCHANT_ID(0, "MERCHANT_ID"), + PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID(1, "PERSONAL_WECHATID"), + PROFIT_SHARING_RECEIVER_PERSONAL_OPENID(2, "PERSONAL_OPENID"), + PROFIT_SHARING_RECEIVER_PERSONAL_SUB_OPENID(3, "PERSONAL_SUB_OPENID"), ; public static EnumProfitSharingReceiverType getEnum(Integer code) { From f3ad185b82db0441886341d91badf01bcd7d6f00 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 8 Sep 2018 22:02:39 +0800 Subject: [PATCH 22/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=8E=A5=E5=8F=97=E6=96=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4,=E5=87=86=E5=A4=87?= =?UTF-8?q?=E9=80=82=E9=85=8DA=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/po/WxProfitSharingReceiver.java | 12 +++++++ .../EnumProfitSharingReceiverStatus.java | 36 +++++++++++++++++++ .../impl/WxProfitSharingOrderServiceImpl.java | 1 + .../WxProfitSharingReceiverServiceImpl.java | 11 +++--- .../mapper/WxProfitSharingReceiverMapper.xml | 11 ++++-- 5 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java index 3f7d8463f..38c4749fc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java @@ -72,6 +72,18 @@ public class WxProfitSharingReceiver implements Serializable { /***/ @io.swagger.annotations.ApiModelProperty(value="",name="bankCode") private String bankCode; + /*分账接收方状态 0,正常 1,停用**/ + @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Long getMerchantId() { return merchantId; } diff --git a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java new file mode 100644 index 000000000..9e0fd53f1 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java @@ -0,0 +1,36 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumProfitSharingReceiverStatus { + PROFIT_SHARING_RECEIVER_STATUS_VALID(0, "正常"), + PROFIT_SHARING_RECEIVER_STATUS_INVALID(1, "停用"), + + ; + + public static EnumProfitSharingReceiverStatus getEnum(Integer code) { + for (EnumProfitSharingReceiverStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumProfitSharingReceiverStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java index ded3cc2aa..6347c4534 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java @@ -185,6 +185,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); wxProfitSharingReceiver.setMerchantId(wxOrder.getMerchantId()); wxProfitSharingReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + wxProfitSharingReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); List wxProfitSharingReceiverList = wxProfitSharingReceiverMapper.findList(wxProfitSharingReceiver); if (wxProfitSharingReceiverList.size()<=0 || wxProfitSharingReceiverList.size() > 50) { throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getMessage()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index 51222c45c..0cb901905 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -12,10 +12,7 @@ import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxPayAccount; import com.simple.domain.po.WxProfitSharingReceiver; -import com.simple.enums.EnumAppType; -import com.simple.enums.EnumProfitSharingReceiverType; -import com.simple.enums.EnumProfitSharingStatus; -import com.simple.enums.EnumProfitSharingType; +import com.simple.enums.*; import com.simple.mapper.WxAppinfoMapper; import com.simple.mapper.WxPayAccountMapper; import com.simple.mapper.WxProfitSharingReceiverMapper; @@ -97,6 +94,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setId(IdWorker.get().nextId()); receiver.setCreateTime(new Date()); receiver.setUpdateTime(new Date()); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); //passed from uplevel //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); @@ -157,6 +155,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); //receiver.setReceiverType(receiverParam.getReceiverType()); @@ -200,8 +199,8 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); } - - wxProfitSharingReceiverMapper.deleteByPrimaryKey(receiver); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); return new ResultData(returnMap); } diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml index 0039bcac4..349d8ecc0 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml @@ -13,10 +13,11 @@ + - `id`,`merchant_id`,`receiver_type`,`receiver_account`,`receiver_comments`,`create_time`,`update_time`,`sharing_type`,`bank_no`,`true_name`,`bank_code` + `id`,`merchant_id`,`receiver_type`,`receiver_account`,`receiver_comments`,`create_time`,`update_time`,`sharing_type`,`bank_no`,`true_name`,`bank_code`,`status` @@ -75,7 +76,13 @@ and `bank_code` like concat('%', #{bankCode},'%') - + + + + and `status` = #{status} + + + and id in From e8360c8be22cf009a9c3dc6e545f3036e12da14e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 9 Sep 2018 18:32:49 +0800 Subject: [PATCH 23/40] =?UTF-8?q?[=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/UploadController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index bdb965383..ed7b541d8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -38,7 +38,7 @@ import java.util.UUID; @RestController @RequestMapping(value = "upload") @Api(description = "文件上传接口") -public class UploadController { +public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -83,7 +83,7 @@ public class UploadController { fs.close(); data.code = ResultData.SUCCESS; Map map = new HashMap<>(); - map.put("imgarray", server + "/" + fileName); + map.put("url", server + "/" + fileName); data.data = map; } catch (Exception e) { e.printStackTrace(); @@ -146,7 +146,7 @@ public class UploadController { .build(); String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); - fileName = fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); s3.putObject( new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) @@ -157,7 +157,7 @@ public class UploadController { data.code = ResultData.SUCCESS; Map map = new HashMap<>(); - map.put("imgarray", url.toString()); + map.put("url", url.toString()); data.data = map; return data; } catch (AmazonServiceException ase) { From cc47489a2d557ca9339b333407d59d73f197e56a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 9 Sep 2018 21:24:27 +0800 Subject: [PATCH 24/40] =?UTF-8?q?[admin=E9=80=80=E6=AC=BE][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 65 +++++++++++++++++-- mallinkBApi/pom.xml | 6 +- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java index 61c16e28c..e8faf194d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -1,22 +1,30 @@ package com.simple.controller; +import com.github.pagehelper.PageInfo; +import com.simple.common.ErrorCode; import com.simple.common.ResultData; +import com.simple.config.PayProperty; +import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxCouponOrder; +import com.simple.enums.EnumAppType; +import com.simple.enums.EnumRefundWay; +import com.simple.exception.MallinkException; +import com.simple.service.WxAppinfoService; import com.simple.service.WxCouponOrderService; +import com.simple.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Map; @RestController @RequestMapping("wxCouponOrder") @@ -27,6 +35,15 @@ public class WxCouponOrderController extends BaseController { @Autowired private WxCouponOrderService wxCouponOrderService; + @Autowired + private WxRefundOrderService wxRefundOrderService; + + @Autowired + private WxAppinfoService wxAppinfoService; + + @Autowired + private PayProperty payProperty; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -46,5 +63,45 @@ public class WxCouponOrderController extends BaseController { } + @ApiOperation(value = "退券退款", notes = "{\"couponOrderId\":\"string\"}") + @PostMapping("/refund") + public ResultData create(@RequestBody Map paramMap) { + //Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + logger.info(paramMap.toString()); + String couponOrderIdStr = paramMap.get("couponOrderId"); + if (StringUtils.isBlank(couponOrderIdStr)) { + logger.error("couponOrderId不能为空: " + paramMap.toString()); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + Long couponOrderId = 0L; + try { + couponOrderId = Long.valueOf(couponOrderIdStr); + } catch (NumberFormatException e) { + logger.error("couponOrderId参数不正确: " + paramMap.toString()); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + + WxAppinfo appinfoQ = new WxAppinfo(); + appinfoQ.setTenantId(getTenantId()); + appinfoQ.setType(EnumAppType.B.getCode()); + PageInfo appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); + if (appinfoPageInfo.getList().size() > 0) { + WxAppinfo appinfo = appinfoPageInfo.getList().get(0); + if (appinfo != null) { + try { + wxRefundOrderService.createRefundOrder(payProperty.isReal(), appinfo, couponOrderId, EnumRefundWay.ADMIN, null); + return new ResultData(); + } catch (MallinkException e) { + logger.error(e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.REFUND_ORDER_ERROR); + } + } + } + return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), "AppInfo获取失败"); + } } diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml index 4b4449c02..82361c3fb 100644 --- a/mallinkBApi/pom.xml +++ b/mallinkBApi/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + mallink com.simple 1.0 @@ -11,7 +11,7 @@ mallinkBApi - + com.simple mallinkService @@ -19,7 +19,7 @@ - + org.springframework.boot From 1b43e9a079866cd34412e976af1e483a8c162a14 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 9 Sep 2018 22:27:47 +0800 Subject: [PATCH 25/40] =?UTF-8?q?[aws=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5exception][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/UploadController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index ed7b541d8..52a6f4265 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -167,6 +167,8 @@ public class UploadController extends BaseController { "to Amazon S3, but was rejected with an error response" + " for some reason."); logger.warn(ase.getMessage()); + data.code = ResultData.ERROR; + data.message = "上传失败"; } catch (AmazonClientException ace) { data.code = ResultData.ERROR; logger.warn("Caught an AmazonClientException, which " + @@ -175,9 +177,13 @@ public class UploadController extends BaseController { "communicate with S3, " + "such as not being able to access the network."); logger.warn("Error Message: " + ace.getMessage()); + data.code = ResultData.ERROR; + data.message = "上传失败"; } catch (IOException ioe) { data.code = ResultData.ERROR; logger.warn("Caught an IOException: " + ioe.getMessage()); + data.code = ResultData.ERROR; + data.message = "上传失败"; } return data; } From 3c97fc7e7c10971690b31f6e15339f8de1ab5a06 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 10:57:01 +0800 Subject: [PATCH 26/40] =?UTF-8?q?[aws=E6=96=87=E4=BB=B6url=20issue][?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]:=E9=95=BF=E6=9C=9Furl=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=9F=AD=E6=9C=9Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/controller/UploadController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java index 52a6f4265..94708dc32 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UploadController.java @@ -151,8 +151,7 @@ public class UploadController extends BaseController { s3.putObject( new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) .withCannedAcl(CannedAccessControlList.PublicRead)); - GeneratePresignedUrlRequest urlRequest = new GeneratePresignedUrlRequest(awsProperty.getBucketName(), fileName); - URL url = s3.generatePresignedUrl(urlRequest); + URL url = s3.getUrl(awsProperty.getBucketName(), fileName); logger.info(url.toString()); data.code = ResultData.SUCCESS; From 9e2267c1b6cbce4522e6894514261f39093bc348 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Sep 2018 11:17:04 +0800 Subject: [PATCH 27/40] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BB=BA=E5=95=86=E6=88=B7=E6=97=B6=E5=BB=BA=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 125 ++++++++++++++++-- 1 file changed, 116 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 36b0e342b..39d4e1910 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -37,6 +37,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxRentContractMapper wxRentContractMapper; + @Autowired + WxBillRentMapper wxBillRentMapper; + @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { @@ -296,31 +299,135 @@ public class WxMerchantServiceImpl implements WxMerchantService { } - private void buildRent(WxRentContract wxRentContract) { + + private void buildRent(WxRentContract wxRentContract,WxShop wxshop) { Date rentalStartDate = wxRentContract.getRentalStartDate(); Date rentalEndDate = wxRentContract.getRentalEndDate(); Integer receivePeriod = wxRentContract.getReceivePeriod(); int paycount = 12 / receivePeriod.intValue(); - + final IdWorker idWorker = IdWorker.get(); if(paycount==1){//12 - Calendar instance = Calendar.getInstance(); - instance.setTime(rentalStartDate); - instance.set(Calendar.MONTH,1); + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setId(idWorker.nextId()); + wxBillRent.setPayStatus(0); + wxBillRent.setPay(new BigDecimal(0)); + wxBillRent.setTenantId(wxshop.getTenantId()); + BigDecimal needpay = wxRentContract.getPayArea().multiply(wxRentContract.getPrice()); + wxBillRent.setNeedPay(needpay); + wxBillRent.setExpiredDay(0); + wxBillRent.setOwe(new BigDecimal(0)); + wxBillRent.setPayDate(rentalStartDate); + wxBillRent.setPayWay(4); + wxBillRent.setPrice(wxRentContract.getPrice()); + wxBillRent.setReceiptNum(""); + wxBillRent.setReceiveDate(rentalStartDate); + wxBillRent.setReceivePay(new BigDecimal(0)); + wxBillRent.setReceivePeriod(receivePeriod); + wxBillRent.setUserArea(new BigDecimal(wxshop.getOperationArea())); + wxBillRent.setShopNumber(wxshop.getShopNumber()); + wxBillRent.setCreatetime(new Date()); + wxBillRentMapper.insertSelective(wxBillRent); } if(paycount==2){//6 + BigDecimal needpay = wxRentContract.getPayArea().multiply(wxRentContract.getPrice()); + BigDecimal needpaymoney = needpay.divide(new BigDecimal(2)).setScale(2, BigDecimal.ROUND_HALF_UP); + for(int i=0;i Date: Mon, 10 Sep 2018 11:18:37 +0800 Subject: [PATCH 28/40] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BB=BA=E5=95=86=E6=88=B7=E6=97=B6=E5=BB=BA=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/service/impl/WxMerchantServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 39d4e1910..3baaaba4c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -152,7 +152,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxRentContract.setReceivePeriod(wxMerchant.getReceivePeriod()); wxRentContractMapper.insertSelective(wxRentContract); - buildRent(wxRentContract); + buildRent(wxRentContract,wxShopP); //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids(); From 5f565f14462314e2c22d9405cef110336f97b875 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 13:53:41 +0800 Subject: [PATCH 29/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=88=86=E8=B4=A6=E6=8E=A5=E6=94=B6=E6=96=B9?= =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=92=8C=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 17 +++++- .../WxProfitSharingReceiverController.java | 2 +- .../WxProfitSharingReceiverService.java | 5 +- .../WxProfitSharingReceiverServiceImpl.java | 54 +++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 6be3711a4..81cd6e654 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxMerchant; +import com.simple.domain.po.WxProfitSharingReceiver; import com.simple.service.WxMerchantService; +import com.simple.service.WxProfitSharingReceiverService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -23,6 +25,9 @@ public class WxMerchantController extends BaseController { @Autowired private WxMerchantService wxMerchantService; + @Autowired + private WxProfitSharingReceiverService wxProfitSharingReceiverService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -74,7 +79,17 @@ public class WxMerchantController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getById(id)); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant = wxMerchantService.getById(id); + if (wxMerchant != null) { + WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); + if (receiver != null){ + wxMerchant.setAccountId(receiver.getReceiverAccount()); + wxMerchant.setAccountName(receiver.getTrueName()); + wxMerchant.setAccountTypeValue(receiver.getReceiverType()); + } + } + return new ResultData(wxMerchant); } @ApiOperation("停用") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java index 942a5a99f..f583576a5 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java @@ -81,7 +81,7 @@ public class WxProfitSharingReceiverController extends BaseController { if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - return wxProfitSharingReceiverService.delReceiver(merchant, receiver); + return wxProfitSharingReceiverService.delReceiver(merchant); } diff --git a/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java b/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java index cdad0e6ee..71301a9cf 100644 --- a/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java +++ b/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java @@ -40,10 +40,11 @@ public interface WxProfitSharingReceiverService { */ void deleteById(Long id); + WxProfitSharingReceiver findReceiver(WxMerchant merchant); ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); + ResultData delReceiver(WxMerchant merchant); - ResultData delReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); - + ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index 0cb901905..f77d3ded9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -23,6 +23,7 @@ import com.simple.pay.WxProfitSharingReceiverP; import com.simple.service.WxProfitSharingReceiverService; import com.simple.utils.BeanUtils; import com.simple.utils.Utility; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; @@ -32,6 +33,8 @@ import com.simple.common.IdWorker; @Service public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiverService { + private Logger logger = Logger.getLogger(WxCouponOrderServiceImpl.class); + final JSONObject errorMap = JSON.parseObject("{" + "\"SYSTEMERROR\":{\"detail\":\"接口返回错误\",\"reason\":\"系统超时\",\"resolution\":\"系统异常，请用相同参数重新调用\"}," + "\"PARAM_ERROR\":{\"detail\":\"参数错误\\t\",\"reason\":\"请求参数未按指引进行填写\",\"resolution\":\"请求参数错误，请重新检查再调用分账接口\"}," + @@ -78,6 +81,16 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } + @Override + public WxProfitSharingReceiver findReceiver(WxMerchant merchant) { + WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); + receiver.setMerchantId(merchant.getId()); + receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); + + return wxProfitSharingReceiverMapper.selectOne(receiver); + } + @Override public ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { @@ -123,20 +136,24 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); response = WxProfitSharing.addReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); }catch (Exception e) { + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + e.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED, e.getMessage()); } Map returnMap = WxPayment.xmlToMap(response); String return_code = returnMap.get("return_code"); if (!"SUCCESS".equals(return_code)) { + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + returnMap.get("return_msg")); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), returnMap.get("return_msg")); } String result_code = returnMap.get("result_code"); if (!"SUCCESS".equals(result_code)) { + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + returnMap.get("err_code_des")); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), returnMap.get("err_code_des")); } if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + "verifyNotifyHMAC"); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage()); } @@ -145,7 +162,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } @Override - public ResultData delReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { + public ResultData delReceiver(WxMerchant merchant) { WxAppinfo appInfo = new WxAppinfo(); appInfo.setTenantId(merchant.getTenantId()); appInfo.setType(EnumAppType.C.getCode()); @@ -153,6 +170,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv appInfo = wxAppinfoMapper.findList(appInfo).get(0); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); + WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); @@ -181,28 +199,56 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv String response; try { wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); - response = WxProfitSharing.addReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); + response = WxProfitSharing.delReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); }catch (Exception e) { + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + e.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED, e.getMessage()); } Map returnMap = WxPayment.xmlToMap(response); String return_code = returnMap.get("return_code"); if (!"SUCCESS".equals(return_code)) { + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + returnMap.get("return_msg")); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), returnMap.get("return_msg")); } String result_code = returnMap.get("result_code"); if (!"SUCCESS".equals(result_code)) { + + if (returnMap.get("err_code").contains("USER_NOT_EXIST")) { + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); + } + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + returnMap.get("result_msg")); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), returnMap.get("result_msg")); } if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ - return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); + logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); } receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); return new ResultData(returnMap); } - + @Override + public ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { + + WxProfitSharingReceiver oldReceiver = new WxProfitSharingReceiver(); + oldReceiver.setMerchantId(merchant.getId()); + oldReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + oldReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); + oldReceiver.setReceiverAccount(receiver.getReceiverAccount()); + oldReceiver.setReceiverType(receiver.getReceiverType()); + oldReceiver.setTrueName(receiver.getTrueName()); + + oldReceiver = wxProfitSharingReceiverMapper.selectOne(oldReceiver); + + if (oldReceiver == null) { + delReceiver(merchant); + return addReceiver(merchant, receiver); + } + + return new ResultData(); + } } From 842fc413285b9dd09beaa07cf7120b02e5222b78 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 14:07:30 +0800 Subject: [PATCH 30/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=BC=96=E8=BE=91=E4=B8=AD=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=96=B9=E6=B7=BB=E5=8A=A0=E5=92=8C=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 3baaaba4c..306dc23a4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -8,6 +8,7 @@ import com.simple.enums.EnumAppType; import com.simple.enums.EnumCarVendor; import com.simple.mapper.*; import com.simple.service.WxMerchantService; +import com.simple.service.WxProfitSharingReceiverService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -193,6 +194,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setStatus(0); wxMerchantBUserMapper.insertSelective(user); + } //添加商户的分账账户（不是必选） + if(wxMerchant.getAccountId() != null && wxMerchant.getAccountName() != null) { + WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); + receiver.setReceiverAccount(wxMerchant.getAccountId()); + receiver.setReceiverComments(wxMerchant.getName()); + receiver.setReceiverType(wxMerchant.getAccountTypeValue()); + receiver.setTrueName(wxMerchant.getAccountName()); + wxRentContractMapperService.addReceiver(wxMerchant, receiver); } } else { @@ -291,11 +300,22 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUserMapper.updateByPrimaryKeySelective(user); } - } - } + //添加商户的分账账户（不是必选） + if(wxMerchant.getAccountId() != null && wxMerchant.getAccountName() != null + && !wxMerchant.getAccountId().isEmpty() && !wxMerchant.getAccountName().isEmpty()) { + WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); + receiver.setReceiverAccount(wxMerchant.getAccountId()); + receiver.setReceiverComments(wxMerchant.getName()); + receiver.setReceiverType(wxMerchant.getAccountTypeValue()); + receiver.setTrueName(wxMerchant.getAccountName()); + wxRentContractMapperService.updateReceiver(wxMerchant, receiver); + } else { + wxRentContractMapperService.delReceiver(wxMerchant); + } + } } From 27a48ddb9838a47fff8067eb446601829dfb6498 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 15:18:56 +0800 Subject: [PATCH 31/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=B8=80=E4=B8=AA=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=9B=B8=E5=85=B3=E7=9A=84commit=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/service/impl/WxMerchantServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 306dc23a4..70a0ff781 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -9,6 +9,7 @@ import com.simple.enums.EnumCarVendor; import com.simple.mapper.*; import com.simple.service.WxMerchantService; import com.simple.service.WxProfitSharingReceiverService; +import com.simple.service.WxRentContractService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +42,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxBillRentMapper wxBillRentMapper; + @Autowired + WxProfitSharingReceiverService wxProfitSharingReceiverService; @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { @@ -201,7 +204,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { receiver.setReceiverComments(wxMerchant.getName()); receiver.setReceiverType(wxMerchant.getAccountTypeValue()); receiver.setTrueName(wxMerchant.getAccountName()); - wxRentContractMapperService.addReceiver(wxMerchant, receiver); + wxProfitSharingReceiverService.addReceiver(wxMerchant, receiver); } } else { @@ -311,9 +314,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { receiver.setReceiverComments(wxMerchant.getName()); receiver.setReceiverType(wxMerchant.getAccountTypeValue()); receiver.setTrueName(wxMerchant.getAccountName()); - wxRentContractMapperService.updateReceiver(wxMerchant, receiver); + wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); } else { - wxRentContractMapperService.delReceiver(wxMerchant); + wxProfitSharingReceiverService.delReceiver(wxMerchant); } } From 222349acf12b73f03ffcc99b6adab4265b1e15a9 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 15:33:59 +0800 Subject: [PATCH 32/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=8E=A5=E6=94=B6=E6=96=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/service/impl/WxProfitSharingReceiverServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index f77d3ded9..f63d6b47e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -216,6 +216,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (returnMap.get("err_code").contains("USER_NOT_EXIST")) { receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + receiver.setUpdateTime(new Date()); wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); } logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + returnMap.get("result_msg")); @@ -227,6 +228,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); } receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + receiver.setUpdateTime(new Date()); wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); return new ResultData(returnMap); } From 49faf2edea87b2b4f31adfca0ea21e98cc56bd09 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Sep 2018 15:59:52 +0800 Subject: [PATCH 33/40] =?UTF-8?q?[=E8=B7=A8=E5=9F=9F][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=B8=8D=E9=99=90=E5=88=B6Url]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkBApi/src/main/java/com/simple/config/CorsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/simple/config/CorsConfig.java b/mallinkBApi/src/main/java/com/simple/config/CorsConfig.java index d33a7559e..9fd07bf4e 100644 --- a/mallinkBApi/src/main/java/com/simple/config/CorsConfig.java +++ b/mallinkBApi/src/main/java/com/simple/config/CorsConfig.java @@ -12,7 +12,7 @@ public class CorsConfig extends WebMvcConfigurerAdapter { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/api/**") + registry.addMapping("/**") .allowedOrigins("*") .allowCredentials(true) .allowedMethods("GET", "POST", "DELETE", "PUT") From dd182298096e8dd1f5eb37b1b90871f2a4a787e1 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 17:02:42 +0800 Subject: [PATCH 34/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=85=8D=E8=B4=B9=E5=88=B8=E5=8E=BB=E6=8E=89=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/service/impl/WxCouponOrderServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index cc745801a..4eb12d416 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -353,9 +353,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxPayOrder.setOrderId(couponOrder.getOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); - if (wxPayOrder == null) - throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); - if (wxPayOrder.getShare() == EnumPayShare.YES.getCode()) + if (wxPayOrder != null && wxPayOrder.getShare() == EnumPayShare.YES.getCode()) wxProfitSharingOrderService.createSharingOrder(wxPayOrder); } catch (Exception e) { logger.error("微信分账: " + e.getMessage()); From e4d21b2cd565eed18f6779756398de4d573a0d5a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 13:35:00 +0800 Subject: [PATCH 35/40] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/common/ErrorCode.java | 1 + .../service/impl/WxPayOrderServiceImpl.java | 50 ++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index cd1319a75..ee67b0594 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -137,6 +137,7 @@ public enum ErrorCode{ PAY_ORDER_NOTIFY_CHECK_SIGN_ERROR(12003 , "支付验签失败"), PAY_ORDER_IS_ZERO(12004, "支付订单金额为0"), PAY_ORDER_IS_NOT_PAYMENT(12005, "不是支付订单"), + PREPAY_ID_IS_EMPTY(12006, "prepay_id是空值"), REFUND_ORDER_EXIST(12010, "退款订单已存在"), REFUND_PAY_ORDER_IS_NOT_EXIST(12011, "退款支付订单不存在"), diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 753c3ba7e..e3a8fffdb 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -229,6 +229,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { JSONObject errObj = errorMap.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } else { @@ -293,6 +301,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { JSONObject errObj = errorMap.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } @@ -373,6 +389,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "订单查询成功", returnMap); } else { JSONObject errObj = errorMap.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } catch (RuntimeException e) { @@ -424,6 +448,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "订单查询成功", returnMap); } else { JSONObject errObj = errorMap.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } catch (RuntimeException e) { @@ -464,6 +496,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "订单关闭成功", returnMap); } else { JSONObject errObj = errorMapClose.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } catch (RuntimeException e) { @@ -498,6 +538,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(Result.SUCCESS, "订单关闭成功", returnMap); } else { JSONObject errObj = errorMapClose.getJSONObject(result_code); + record.setFailReason(errObj.toJSONString()); + record.setUpdateTime(new Date()); + try { + wxPayOrderMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("pay order update error: " + record.toString()); + throw new MallinkException(ErrorCode.DB_FAIL); + } return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } catch (RuntimeException e) { @@ -887,7 +935,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (StringUtils.isBlank(updateOrder.getPrepayId())) { logger.error("prepayId为空"); - throw new MallinkException(ErrorCode.USER_IS_EMPTY); + throw new MallinkException(ErrorCode.PREPAY_ID_IS_EMPTY); } WxMaService wxMaService = MaUtil.getWeappService(appInfo); From 4c4b3a5537ac3d907f2c8bc64d99bdb3881dd4cd Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 18:20:23 +0800 Subject: [PATCH 36/40] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=8F=91=E5=88=B8/?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=8F=91=E5=88=B8][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E8=AF=95=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCarCallBackController.java | 2 +- .../enums/EnumCouponActionChannelType.java | 40 ++++++++ .../java/com/simple/enums/EnumEnableType.java | 38 ++++++++ .../simple/service/WxCouponSendService.java | 7 +- .../com/simple/service/WxOrderService.java | 11 ++- .../impl/WxCouponOrderServiceImpl.java | 2 +- .../service/impl/WxCouponSendServiceImpl.java | 88 ++++++++---------- .../service/impl/WxOrderServiceImpl.java | 91 ++++++++++++++++++- 8 files changed, 221 insertions(+), 58 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumCouponActionChannelType.java create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumEnableType.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java index 3836c6eb9..8012438d7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java @@ -109,7 +109,7 @@ public class WxCarCallBackController extends BaseController { // TODO 可能多用户关联同一张车牌 List userCarList = wxCUserCarService.getList(userCarQ); for (WxCUserCar userCar : userCarList) { - wxCouponSendService.sendCouponToUser(tenantId, userCar.getCUserId(), EnumCouponSendType.CAR_STOP.getCode()); + wxCouponSendService.sendCouponToUser(tenantId, userCar.getCUserId(), EnumCouponSendType.CAR_STOP); } } diff --git a/mallinkService/src/main/java/com/simple/enums/EnumCouponActionChannelType.java b/mallinkService/src/main/java/com/simple/enums/EnumCouponActionChannelType.java new file mode 100644 index 000000000..a837cd921 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumCouponActionChannelType.java @@ -0,0 +1,40 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCouponActionChannelType { + + // 0:精准 1:主动领取 2:用户购买 3:停车 4:核销 + PRECISE(0, "精准"), + RECEIVE(1, "主动领取"), + BUY(2, "用户购买"), + CAR(3, "停车"), + VERIFY(4, "核销") + ; + + public static EnumCouponActionChannelType getEnum(Integer code) { + for (EnumCouponActionChannelType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCouponActionChannelType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/simple/enums/EnumEnableType.java b/mallinkService/src/main/java/com/simple/enums/EnumEnableType.java new file mode 100644 index 000000000..b3223dd68 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumEnableType.java @@ -0,0 +1,38 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumEnableType { + + // 0:启用 1:停用 + + Enable(0, "启用"), + Disable(1, "停用") + ; + + public static EnumEnableType getEnum(Integer code) { + for (EnumEnableType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumEnableType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java index ce289abdd..3db6d00d7 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java @@ -3,6 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCouponSend; +import com.simple.enums.EnumCouponSendType; public interface WxCouponSendService { @@ -10,8 +11,8 @@ public interface WxCouponSendService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize); @@ -44,7 +45,7 @@ public interface WxCouponSendService { * @param cUserId * @param type 2：停车发券 3：核销发券 */ - void sendCouponToUser(String tenantId,Long cUserId,int type); + void sendCouponToUser(String tenantId, Long cUserId, EnumCouponSendType type); void updateStatusByCouponId(Long couponId,String tenantId,int status); diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index c5de8208e..2bd01b699 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -5,6 +5,7 @@ import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCUser; +import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxOrder; import com.simple.domain.vo.WxOrderCVo; import com.simple.enums.EnumOrderStatus; @@ -34,10 +35,18 @@ public interface WxOrderService { * 免费券订单接口 * @param userId * @param couponId - * @return 订单id + * @return WxOrder */ WxOrder sendUserFreeCoupon(Long userId, Long couponId); + /** + * 免费券订单接口 + * @param userId + * @param couponId + * @return WxCouponOrder + */ + WxCouponOrder sendFreeCouponToUser(Long userId, Long couponId); + /** * orderSuccess 订单已支付 * @param updateOrder diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 4eb12d416..7028f028a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -366,7 +366,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(couponOrder.getOrderId()); if (wxOrder != null) { try { - wxCouponSendService.sendCouponToUser(bUser.getTenantId(), wxOrder.getCUserId(), EnumCouponSendType.COUPON_VERIFY.getCode()); + wxCouponSendService.sendCouponToUser(bUser.getTenantId(), wxOrder.getCUserId(), EnumCouponSendType.COUPON_VERIFY); } catch (Exception e) { logger.error("核销发券: " + e.getMessage()); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java index 0e5eab49d..8c546e64f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java @@ -1,34 +1,41 @@ package com.simple.service.impl; -import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxCoupon; -import com.simple.domain.po.WxCouponOrder; -import com.simple.domain.po.WxCouponSend; -import com.simple.domain.po.WxMallConfig; +import com.simple.common.IdWorker; +import com.simple.domain.po.*; +import com.simple.enums.*; +import com.simple.mapper.WxCouponOrderMapper; import com.simple.mapper.WxCouponSendMapper; import com.simple.service.*; import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.List; + @Service public class WxCouponSendServiceImpl implements WxCouponSendService { - - @Autowired + + @Autowired WxCouponSendMapper wxCouponSendMapper; - @Autowired + @Autowired WxCouponOrderService wxCouponOrderService; - @Autowired + @Autowired WxCouponService wxCouponService; - @Autowired + @Autowired WxCouponActionLogService wxCouponActionLogService; - @Autowired + @Autowired WxMallConfigService wxMallConfigService; + @Autowired + WxOrderService wxOrderService; + + @Autowired + WxCouponOrderMapper wxCouponOrderMapper; + @Override public PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize) { @@ -45,7 +52,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); + record.setId(idWorker.nextId()); wxCouponSendMapper.insertSelective(record); } else { wxCouponSendMapper.updateByPrimaryKeySelective(record); @@ -59,61 +66,46 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Override @Transactional - public void sendCouponToUser(String tenantId, Long cUserId, int type) { + public void sendCouponToUser(String tenantId, Long cUserId, EnumCouponSendType type) { //查询开关是否打开 //查询停车或者核销的券 stopCarCouponSwitch verifyConponSwitch WxCouponSend wxCouponSendQuery = new WxCouponSend(); wxCouponSendQuery.setTenantId(tenantId); - int actionLogType=0; - String configKey=""; - if(type==2){ + int actionLogType = 0; + String configKey = ""; + if (type == EnumCouponSendType.CAR_STOP) { //停车 - wxCouponSendQuery.setSendType(2); - actionLogType=3; - configKey="stopCarCouponSwitch"; + wxCouponSendQuery.setSendType(EnumCouponSendType.CAR_STOP.getCode()); + actionLogType = EnumCouponActionChannelType.CAR.getCode(); + configKey = "stopCarCouponSwitch"; } - if(type==3){ + if (type == EnumCouponSendType.COUPON_VERIFY) { //核销 - wxCouponSendQuery.setSendType(3); - actionLogType=4; - configKey="verifyConponSwitch"; - }else{ + wxCouponSendQuery.setSendType(EnumCouponSendType.COUPON_VERIFY.getCode()); + actionLogType = EnumCouponActionChannelType.VERIFY.getCode(); + configKey = "verifyConponSwitch"; + } else { return; } WxMallConfig wxMallConfigQuery = new WxMallConfig(); wxMallConfigQuery.setKey(configKey); wxMallConfigQuery.setTenantId(tenantId); PageInfo page = wxMallConfigService.listAsPage(wxMallConfigQuery, 1, 1); - if(page.getSize()>0) { + if (page.getSize() > 0) { WxMallConfig config = page.getList().get(0); - if(config.getValue()==1){ + if (config.getValue() == EnumEnableType.Disable.getCode()) { return; } } - List wxCouponSends = wxCouponSendMapper.findList(wxCouponSendQuery); - for (WxCouponSend send:wxCouponSends) { - WxCoupon wxCoupon= wxCouponService.getById(send.getCouponId()); - WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setCouponId(wxCoupon.getId()); - wxCouponOrder.setCouponOrderStatus(0); - wxCouponOrder.setCUserId(cUserId); - wxCouponOrder.setCouponPrice(0); - wxCouponOrder.setCreateDate(new Date()); - if (wxCoupon.getValidType() == 1) { //时间范围区间 - if(new Date().after(wxCoupon.getValidEndDate())){ - continue; - } - wxCouponOrder.setExpiredTime(wxCoupon.getValidEndDate()); - } else { - Date date = DateUtils.addDays(new Date(), wxCoupon.getValidDays()); - wxCouponOrder.setExpiredTime(date); + for (WxCouponSend send : wxCouponSends) { + // 发放免费券 + WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cUserId, send.getCouponId()); + if (couponOrder != null) { + wxCouponActionLogService.addOne(tenantId, send.getCouponId(), couponOrder.getId(), actionLogType, send.getId()); } - wxCouponOrder.setTenantId(wxCoupon.getTenantId()); - Long couponOrderId = wxCouponOrderService.insertOne(wxCouponOrder); - wxCouponActionLogService.addOne(tenantId, wxCoupon.getId(), couponOrderId, actionLogType, send.getId()); - wxCouponService.reduceInventory(wxCoupon.getId(),1); + wxCouponService.reduceInventory(send.getCouponId(), 1); } } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index 51197e495..2aac9638d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -259,7 +259,7 @@ public class WxOrderServiceImpl implements WxOrderService { * @param order * @param coupon */ - private void createCouponOrder(WxCUser user, WxOrder order, WxCoupon coupon) { + private WxCouponOrder createCouponOrder(WxCUser user, WxOrder order, WxCoupon coupon) { Date curr = new Date(); Date valid_date = null; if (coupon.getValidType() == EnumValidStatus.VALID_RANGE.getCode()) @@ -299,9 +299,11 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setCouponPrice(order.getPayment()); wxCouponOrderMapper.insertSelective(couponOrder); + return couponOrder; } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxOrder sendUserFreeCoupon(Long userId, Long couponId) { // check 用户状态 WxCUser user = null; @@ -346,6 +348,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setId(orderNumber); record.setTenantId(user.getTenantId()); record.setOrderNumber(orderNumber); + record.setCouponId(couponId); record.setCUserId(user.getId()); record.setMerchantId(coupon.getMerchantId()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); @@ -359,25 +362,105 @@ public class WxOrderServiceImpl implements WxOrderService { try { wxOrderMapper.insertSelective(record); } catch (Exception e) { + logger.error("保存订单：" + e.getMessage()); // 库存恢复 stockBack(record); - logger.error("保存订单：" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); } // 创建couponOrder try { - createCouponOrder(user, record, coupon); + WxCouponOrder couponOrder = createCouponOrder(user, record, coupon); } catch (Exception e) { + logger.error("保存订单：" + e.getMessage()); // 库存恢复 stockBack(record); - logger.error("保存订单：" + e.getMessage()); throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR); } return record; } + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public WxCouponOrder sendFreeCouponToUser(Long userId, Long couponId) { + // check 用户状态 + WxCUser user = null; + try { + user = wxCUserMapper.selectByPrimaryKey(userId); + } catch (Exception e) { + logger.error("userId : " + userId + ", e: " + e.getMessage()); + } + if (user == null) { + logger.error("用户不存在, userId: " + userId); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + + // 检查券状态 + String couponIdStr = String.valueOf(couponId); + WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(couponId); + if (coupon == null) { + logger.error("券不存在, couponId: " + couponIdStr); + throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); + } + if (coupon.getStatus() == EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()) { + logger.error("券已下架, couponId: " + couponIdStr); + throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); + } + if (coupon.getSalePrice() != 0) { + logger.error("券不免费, couponId: " + couponIdStr); + throw new MallinkException(ErrorCode.COUPON_IS_NOT_FREE); + } + + int payment = coupon.getSalePrice(); + + Date curr = new Date(); + + final IdWorker idWorker = IdWorker.get(); + Long orderNumber = idWorker.nextId(); + + // body + // tenant_id + merchant_id + title + subtitle + String bodyStr = coupon.getTitle() + "/" + coupon.getSubTitle(); + + WxOrder record = new WxOrder(); + record.setId(orderNumber); + record.setTenantId(user.getTenantId()); + record.setOrderNumber(orderNumber); + record.setCouponId(couponId); + record.setCUserId(user.getId()); + record.setMerchantId(coupon.getMerchantId()); + record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); + record.setPayment(payment); + record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + record.setDetail(bodyStr); + record.setCreateDate(curr); + record.setUpdateDate(curr); + + // 保存订单 + try { + wxOrderMapper.insertSelective(record); + } catch (Exception e) { + logger.error("保存订单：" + e.getMessage()); + // 库存恢复 + stockBack(record); + throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); + } + + // 创建couponOrder + WxCouponOrder couponOrder = null; + try { + couponOrder = createCouponOrder(user, record, coupon); + } catch (Exception e) { + logger.error("保存订单：" + e.getMessage()); + // 库存恢复 + stockBack(record); + throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR); + } + + return couponOrder; + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public int orderSuccess(WxOrder updateOrder) { From e111c17f5b5bf9180547bddaf5749a11c1ac2e96 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Sep 2018 19:46:13 +0800 Subject: [PATCH 37/40] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponOrderServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 7028f028a..3c85f2a92 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.simple.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; @@ -19,6 +20,8 @@ import com.simple.enums.EnumPayStatus; import com.simple.exception.MallinkException; import com.simple.mapper.*; import com.simple.service.*; +import com.simple.utils.DataUtil; +import com.simple.utils.DateUtils; import org.apache.log4j.Logger; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; @@ -64,6 +67,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxPayOrderMapper wxPayOrderMapper; + @Autowired + WxMallMapper wxMallMapper; + @Override public PageInfo listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { @@ -241,17 +247,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setTenantId(tenantId); List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); - + WxMall wxMall = new WxMall(); + wxMall.setTenantId(tenantId); + wxMall = wxMallMapper.findList(wxMall).get(0); String filepath="./uploads/"; File savefile = new File(filepath); if (!savefile.exists()) { savefile.mkdirs(); } - Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WxCouponOrderBVo.class, list); + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("","",ExcelType.XSSF), WxCouponOrderBVo.class, list); FileOutputStream fos = null; try { - String filename=UUID.randomUUID()+".xlsx"; + String filename=wxMall.getName()+ DateUtils.getSystemTime("yyyyMMDDHHmmss") +".xlsx"; filepath=filepath+filename; fos = new FileOutputStream(filepath); workbook.write(fos); From 5a53a9b4de14fa0acdbcc681a3e58223c32e1101 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 20:22:41 +0800 Subject: [PATCH 38/40] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=97=B6=E5=8C=BA=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPayOrderServiceImpl.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index e3a8fffdb..fc1197a3f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -228,8 +228,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.info("back to UI: " +returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { + String errMsg = ""; JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -237,7 +244,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { // 统一下单 // 服务商模式 @@ -300,8 +307,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.info("back to UI: " +returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { + String errMsg = ""; JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -309,7 +323,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } } else { From 976fa1dc976f7af5960b1cd9e47f8d2b54f3a3ca Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 21:20:48 +0800 Subject: [PATCH 39/40] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=80=E6=AC=BE=E5=BC=82=E5=B8=B8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPayOrderServiceImpl.java | 26 +++++++--- .../impl/WxRefundOrderServiceImpl.java | 52 ++++++++++++------- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index fc1197a3f..ee0cccdc9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -402,8 +402,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } return new ResultData(Result.SUCCESS, "订单查询成功", returnMap); } else { - JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + String errMsg = ""; + JSONObject errObj = errorMapQuery.getJSONObject(result_code); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -411,7 +418,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } catch (RuntimeException e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); @@ -461,8 +468,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } return new ResultData(Result.SUCCESS, "订单查询成功", returnMap); } else { - JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + String errMsg = ""; + JSONObject errObj = errorMapQuery.getJSONObject(result_code); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -470,7 +484,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } catch (RuntimeException e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java index 76f559ff2..a2b8972e0 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -467,16 +467,19 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR); } } else { - logger.error("微信退款订单申请失败: " + returnMap.toString()); - try { - record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); - JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); - } catch(Exception e) { - logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); - throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR); + logger.error("微信退款订单申请失败: " + response); + String errMsg = ""; + JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); } + record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); + wxRefundOrderMapper.updateByPrimaryKey(record); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { // 服务商模式 @@ -543,16 +546,19 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR); } } else { - logger.error("微信退款订单申请失败: " + returnMap.toString()); - try { - record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); - wxRefundOrderMapper.updateByPrimaryKey(record); - JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); - } catch(Exception e) { - logger.error("微信退款订单更新入库出错: " + e.getMessage() + ", record: " + record.toString()); - throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR); + logger.error("微信退款订单申请失败: " + response); + String errMsg = ""; + JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); } + record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); + wxRefundOrderMapper.updateByPrimaryKey(record); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } } else { @@ -636,8 +642,16 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { String refund_id = returnMap.get("refund_id"); return new ResultData(Result.SUCCESS, "退款", returnMap); } else { + String errMsg = ""; + JSONObject errObj = errorRefundQueryMap.getJSONObject(result_no); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } wxRefundOrderMapper.updateByPrimaryKey(record); - JSONObject errObj = errorRefundReqMap.getJSONObject(result_no); return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); } } From 41fee90d72f660f390c341a54dd1bcec62f0c18f Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 11 Sep 2018 14:02:49 +0800 Subject: [PATCH 40/40] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=B8=8B=E6=9E=B6=E4=BB=BB=E5=8A=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 4f36c5a76..d5a77dca8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -153,12 +153,12 @@ - update wx_coupon_channel, wx_coupon c SET cc.status = 1, cc.update_date = now() + update wx_coupon_channel cc, wx_coupon c SET cc.status = 1, cc.update_date = now() where cc.status = 0 and cc.coupon_id = c.id and c.valid_type = 1 and valid_end_date < now() - update wx_coupon_channel, wx_coupon c SET cc.status = 1, cc.update_date = now() + update wx_coupon_channel cc, wx_coupon c SET cc.status = 1, cc.update_date = now() where cc.status = 0 and cc.coupon_id = c.id and c.status = 1