From 2953abbadce3dec52243ad5a02b2d87e8b1509bd Mon Sep 17 00:00:00 2001 From: masterspirit Date: Fri, 10 Aug 2018 18:57:21 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=A1=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserCouponController.java | 39 ++++++++++ .../com/simple/service/WxOrderService.java | 7 ++ .../simple/service/WxUserCouponService.java | 13 ++++ .../com/simple/service/dto/WxUserCoupon.java | 71 +++++++++++++++++++ .../service/impl/WxOrderServiceImpl.java | 15 ++-- .../service/impl/WxUserCouponServiceImpl.java | 65 +++++++++++++++++ 6 files changed, 202 insertions(+), 8 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java create mode 100644 mallinkService/src/main/java/com/simple/service/WxUserCouponService.java create mode 100644 mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java new file mode 100644 index 000000000..9a2dbbd6f --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java @@ -0,0 +1,39 @@ +package com.simple.controller; + +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxOrder; +import com.simple.service.WxCUserService; +import com.simple.service.WxOrderService; +import com.simple.service.WxUserCouponService; +import com.simple.service.dto.WxUserCoupon; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +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; + +/** + * Created by syf on 2018/8/10. + */ +@RestController +@RequestMapping("wxUserCoupon") +public class WxUserCouponController { + + + @Autowired + private WxUserCouponService wxUserCouponService; + + + @ApiOperation("查询用户卡券接口") + @PostMapping("findByStatus") + public ResultData findByStatus(@RequestBody WxUserCoupon wxUserCoupon) { + //根据用户id,用户卡券状态查找 + if(wxUserCoupon==null||wxUserCoupon.getcUserId()==null||wxUserCoupon.getCouponStatus()==null){ + return new ResultData(Result.ERROR,"查询失败"); + } + return new ResultData(Result.SUCCESS,"查询成功",wxUserCouponService.findList(wxUserCoupon.getcUserId(),wxUserCoupon.getCouponStatus())); + } + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index a3d9a6bbd..d1dba36b8 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -52,6 +52,13 @@ public interface WxOrderService { * @param id */ void deleteById(Long id); + /** + * 条件查询不分页 + * @param record + * @return + */ + List findList(WxOrder record); + diff --git a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java new file mode 100644 index 000000000..bdd52c716 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java @@ -0,0 +1,13 @@ +package com.simple.service; + +import com.simple.service.dto.WxUserCoupon; + +import java.util.List; + +/** + * Created by syf on 2018/8/10. + */ +public interface WxUserCouponService { + List findList(Long userId,int status); + +} diff --git a/mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java b/mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java new file mode 100644 index 000000000..da847b468 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java @@ -0,0 +1,71 @@ +package com.simple.service.dto; + +import com.simple.domain.po.WxOrder; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created by syf on 2018/8/10. + * 用户卡券 + */ +public class WxUserCoupon implements Serializable { + private static final long serialVersionUID = 1L; + + private Integer couponStatus; + private Long orderId; + private Long cUserId; + private Long couponId; + private String couponTitle; + private Date validDate; + + public WxUserCoupon(){ + } + + public Integer getCouponStatus() { + return couponStatus; + } + + public void setCouponStatus(Integer couponStatus) { + this.couponStatus = couponStatus; + } + + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + + public Long getcUserId() { + return cUserId; + } + + public void setcUserId(Long cUserId) { + this.cUserId = cUserId; + } + + public Long getCouponId() { + return couponId; + } + + public void setCouponId(Long couponId) { + this.couponId = couponId; + } + + public String getCouponTitle() { + return couponTitle; + } + + public void setCouponTitle(String couponTitle) { + this.couponTitle = couponTitle; + } + public Date getValidDate() { + return validDate; + } + + public void setValidDate(Date validDate) { + this.validDate = validDate; + } +} 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 34a5073e1..9dc2b6ff4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -114,12 +114,11 @@ public class WxOrderServiceImpl implements WxOrderService { public void deleteById(Long id) { wxOrderMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public List findList(WxOrder record) { + return wxOrderMapper.findList(record); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java new file mode 100644 index 000000000..8cedf8153 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java @@ -0,0 +1,65 @@ +package com.simple.service.impl; +import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxOrder; +import com.simple.mapper.WxCouponMapper; +import com.simple.service.WxOrderService; +import com.simple.service.WxUserCouponService; +import com.simple.service.dto.WxUserCoupon; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * Created by syf on 2018/8/10. + */ +@Service +public class WxUserCouponServiceImpl implements WxUserCouponService { + + @Autowired + private WxOrderService wxOrderService; + @Autowired + private WxCouponMapper wxCouponMapper; + + /** + * + * @param userId 用户id + * @param status 用户卡券状态 + * @return + */ + @Override + public List findList(Long userId, int status) { + //TODO 待测试优化 + List wxUserCoupons = new ArrayList<>(); + //查询订单表 + WxOrder wxOrder = new WxOrder(); + wxOrder.setCUserId(userId); + wxOrder.setCouponStatus(status); + List orders = wxOrderService.findList(wxOrder); + List ids = orders.stream().map(p->p.getCouponId()+"").distinct().collect(Collectors.toList()); + if(ids.size()>0){ + //查询WxCoupon + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setIds(ids); + List wxCoupons = wxCouponMapper.findList(wxCoupon); + Map couponNamesMap = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId,p->p.getTitle())); + for (WxOrder temp:orders) { + wxUserCoupons.add(getWxUserCoupon(temp,couponNamesMap.get(temp.getCouponId()))); + } + } + return wxUserCoupons; + } + public WxUserCoupon getWxUserCoupon(WxOrder wxOrder,String title){ + WxUserCoupon wxUserCoupon = new WxUserCoupon(); + wxUserCoupon.setOrderId(wxOrder.getId()); + wxUserCoupon.setcUserId(wxOrder.getCUserId()); + wxUserCoupon.setCouponId(wxOrder.getCouponId()); + wxUserCoupon.setCouponStatus(wxOrder.getCouponStatus()); + wxUserCoupon.setValidDate(wxOrder.getValidDate()); + wxUserCoupon.setCouponTitle(title); + return wxUserCoupon; + } +} From ea9e86f4e8d401881704817010d12241097fbc66 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 21:55:11 +0800 Subject: [PATCH 02/10] =?UTF-8?q?C=E7=AB=AF=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {mallinkApi => mallinkCclientApi}/pom.xml | 2 +- .../src/main/java/com/simple/UserApplication.java | 0 .../src/main/java/com/simple/controller/BaseController.java | 0 .../main/java/com/simple/controller/WxAppinfoController.java | 0 .../src/main/java/com/simple/controller/WxBLogController.java | 0 .../main/java/com/simple/controller/WxBannersController.java | 0 .../main/java/com/simple/controller/WxBusinessController.java | 0 .../src/main/java/com/simple/controller/WxCLogController.java | 0 .../main/java/com/simple/controller/WxCUserCarsController.java | 0 .../src/main/java/com/simple/controller/WxCUserController.java | 0 .../main/java/com/simple/controller/WxCUserTagsController.java | 0 .../main/java/com/simple/controller/WxCarCmdLogsController.java | 0 .../java/com/simple/controller/WxCouponActionLogController.java | 0 .../main/java/com/simple/controller/WxCouponCarController.java | 0 .../java/com/simple/controller/WxCouponChannelController.java | 0 .../src/main/java/com/simple/controller/WxCouponController.java | 0 .../main/java/com/simple/controller/WxCouponSendController.java | 0 .../main/java/com/simple/controller/WxCouponTypeController.java | 0 .../java/com/simple/controller/WxCouponVerifyController.java | 0 .../java/com/simple/controller/WxMallBuildingController.java | 0 .../src/main/java/com/simple/controller/WxMallController.java | 0 .../main/java/com/simple/controller/WxMallFloorController.java | 0 .../java/com/simple/controller/WxMerchantBUserController.java | 0 .../main/java/com/simple/controller/WxMerchantController.java | 0 .../java/com/simple/controller/WxMerchantShopController.java | 0 .../com/simple/controller/WxMerchantTradeDailyController.java | 0 .../java/com/simple/controller/WxMsgCallbackController.java | 0 .../main/java/com/simple/controller/WxMsgConfigController.java | 0 .../src/main/java/com/simple/controller/WxMsgController.java | 0 .../main/java/com/simple/controller/WxMsgModelController.java | 0 .../java/com/simple/controller/WxMsgSignatureController.java | 0 .../src/main/java/com/simple/controller/WxOrderController.java | 0 .../src/main/java/com/simple/controller/WxParkController.java | 0 .../main/java/com/simple/controller/WxPayOrderController.java | 0 .../java/com/simple/controller/WxScoreHistoryController.java | 0 .../main/java/com/simple/controller/WxScoreRulesController.java | 0 .../com/simple/controller/WxScoreValidityPeriodController.java | 0 .../src/main/java/com/simple/controller/WxShopController.java | 0 .../src/main/java/com/simple/controller/WxTagsController.java | 0 .../src/main/java/com/simple/controller/WxWebLogController.java | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application.yml | 0 43 files changed, 1 insertion(+), 1 deletion(-) rename {mallinkApi => mallinkCclientApi}/pom.xml (94%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/UserApplication.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/BaseController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxAppinfoController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxBLogController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxBannersController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxBusinessController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCLogController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCUserCarsController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCUserController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCUserTagsController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCarCmdLogsController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponActionLogController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponCarController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponChannelController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponSendController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponTypeController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxCouponVerifyController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMallBuildingController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMallController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMallFloorController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMerchantBUserController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMerchantController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMerchantShopController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMsgCallbackController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMsgConfigController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMsgController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMsgModelController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxMsgSignatureController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxOrderController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxParkController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxPayOrderController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxScoreHistoryController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxScoreRulesController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxShopController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxTagsController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/java/com/simple/controller/WxWebLogController.java (100%) rename {mallinkApi => mallinkCclientApi}/src/main/resources/application-dev.yml (100%) rename {mallinkApi => mallinkCclientApi}/src/main/resources/application-prod.yml (100%) rename {mallinkApi => mallinkCclientApi}/src/main/resources/application.yml (100%) diff --git a/mallinkApi/pom.xml b/mallinkCclientApi/pom.xml similarity index 94% rename from mallinkApi/pom.xml rename to mallinkCclientApi/pom.xml index 3ac70aff9..521ab1588 100644 --- a/mallinkApi/pom.xml +++ b/mallinkCclientApi/pom.xml @@ -9,7 +9,7 @@ 1.0 - mallinkApi + mallinkCclientApi diff --git a/mallinkApi/src/main/java/com/simple/UserApplication.java b/mallinkCclientApi/src/main/java/com/simple/UserApplication.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/UserApplication.java rename to mallinkCclientApi/src/main/java/com/simple/UserApplication.java diff --git a/mallinkApi/src/main/java/com/simple/controller/BaseController.java b/mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/BaseController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxBLogController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxBannersController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCLogController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCUserController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponCarController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponChannelController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponSendController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxCouponVerifyController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMallController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMerchantBUserController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMsgCallbackController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMsgController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxOrderController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxParkController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxShopController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxTagsController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java diff --git a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java similarity index 100% rename from mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java rename to mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java diff --git a/mallinkApi/src/main/resources/application-dev.yml b/mallinkCclientApi/src/main/resources/application-dev.yml similarity index 100% rename from mallinkApi/src/main/resources/application-dev.yml rename to mallinkCclientApi/src/main/resources/application-dev.yml diff --git a/mallinkApi/src/main/resources/application-prod.yml b/mallinkCclientApi/src/main/resources/application-prod.yml similarity index 100% rename from mallinkApi/src/main/resources/application-prod.yml rename to mallinkCclientApi/src/main/resources/application-prod.yml diff --git a/mallinkApi/src/main/resources/application.yml b/mallinkCclientApi/src/main/resources/application.yml similarity index 100% rename from mallinkApi/src/main/resources/application.yml rename to mallinkCclientApi/src/main/resources/application.yml From e550d09f34d31c5a2d5eca8a9d366aaa32c85ed7 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Fri, 10 Aug 2018 21:55:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=A1=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxUserCouponController.java | 5 +---- .../com/simple/{service => domain}/dto/WxUserCoupon.java | 4 +--- .../main/java/com/simple/service/WxUserCouponService.java | 6 ++++-- .../com/simple/service/impl/WxUserCouponServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) rename mallinkService/src/main/java/com/simple/{service => domain}/dto/WxUserCoupon.java (95%) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java index 9a2dbbd6f..6017a46aa 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java @@ -2,11 +2,8 @@ package com.simple.controller; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxOrder; -import com.simple.service.WxCUserService; -import com.simple.service.WxOrderService; +import com.simple.domain.dto.WxUserCoupon; import com.simple.service.WxUserCouponService; -import com.simple.service.dto.WxUserCoupon; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java similarity index 95% rename from mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java rename to mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java index da847b468..c0996856d 100644 --- a/mallinkService/src/main/java/com/simple/service/dto/WxUserCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java @@ -1,6 +1,4 @@ -package com.simple.service.dto; - -import com.simple.domain.po.WxOrder; +package com.simple.domain.dto; import java.io.Serializable; import java.util.Date; diff --git a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java index bdd52c716..5226b7895 100644 --- a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java @@ -1,6 +1,8 @@ package com.simple.service; -import com.simple.service.dto.WxUserCoupon; + + +import com.simple.domain.dto.WxUserCoupon; import java.util.List; @@ -8,6 +10,6 @@ import java.util.List; * Created by syf on 2018/8/10. */ public interface WxUserCouponService { - List findList(Long userId,int status); + List findList(Long userId, int status); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java index 8cedf8153..2b21dcc03 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java @@ -1,10 +1,10 @@ package com.simple.service.impl; +import com.simple.domain.dto.WxUserCoupon; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; import com.simple.mapper.WxCouponMapper; import com.simple.service.WxOrderService; import com.simple.service.WxUserCouponService; -import com.simple.service.dto.WxUserCoupon; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From 3e858d670fa43f2dcf00317c501fdec56311ab25 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 22:03:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCclientApi/pom.xml | 2 +- mallinkCclientApi/src/main/resources/application.yml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCclientApi/pom.xml b/mallinkCclientApi/pom.xml index 521ab1588..171a06129 100644 --- a/mallinkCclientApi/pom.xml +++ b/mallinkCclientApi/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 diff --git a/mallinkCclientApi/src/main/resources/application.yml b/mallinkCclientApi/src/main/resources/application.yml index bec78e171..969f60a12 100644 --- a/mallinkCclientApi/src/main/resources/application.yml +++ b/mallinkCclientApi/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: - port: 9000 - context-path: / + port: 8000 + context-path: /C spring: application: diff --git a/pom.xml b/pom.xml index 251dde958..df178f8ca 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ mallinkService mallinkAdmin - mallinkApi + mallinkCclientApi From fa48a66949035774bc08c3c3010281ce8094294a Mon Sep 17 00:00:00 2001 From: masterspirit Date: Fri, 10 Aug 2018 22:08:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=A1=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxUserCouponController.java | 4 ++-- .../dto/{WxUserCoupon.java => WxUserCouponDto.java} | 4 ++-- .../java/com/simple/service/WxUserCouponService.java | 4 ++-- .../simple/service/impl/WxUserCouponServiceImpl.java | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename mallinkService/src/main/java/com/simple/domain/dto/{WxUserCoupon.java => WxUserCouponDto.java} (93%) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java index 6017a46aa..cffbc4bf1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxUserCouponController.java @@ -2,7 +2,7 @@ package com.simple.controller; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import com.simple.service.WxUserCouponService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ public class WxUserCouponController { @ApiOperation("查询用户卡券接口") @PostMapping("findByStatus") - public ResultData findByStatus(@RequestBody WxUserCoupon wxUserCoupon) { + public ResultData findByStatus(@RequestBody WxUserCouponDto wxUserCoupon) { //根据用户id,用户卡券状态查找 if(wxUserCoupon==null||wxUserCoupon.getcUserId()==null||wxUserCoupon.getCouponStatus()==null){ return new ResultData(Result.ERROR,"查询失败"); diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java similarity index 93% rename from mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java rename to mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java index c0996856d..64e8394fb 100644 --- a/mallinkService/src/main/java/com/simple/domain/dto/WxUserCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxUserCouponDto.java @@ -7,7 +7,7 @@ import java.util.Date; * Created by syf on 2018/8/10. * 用户卡券 */ -public class WxUserCoupon implements Serializable { +public class WxUserCouponDto implements Serializable { private static final long serialVersionUID = 1L; private Integer couponStatus; @@ -17,7 +17,7 @@ public class WxUserCoupon implements Serializable { private String couponTitle; private Date validDate; - public WxUserCoupon(){ + public WxUserCouponDto(){ } public Integer getCouponStatus() { diff --git a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java index 5226b7895..d9394967e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxUserCouponService.java @@ -2,7 +2,7 @@ package com.simple.service; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import java.util.List; @@ -10,6 +10,6 @@ import java.util.List; * Created by syf on 2018/8/10. */ public interface WxUserCouponService { - List findList(Long userId, int status); + List findList(Long userId, int status); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java index 2b21dcc03..ff8c1172e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java @@ -1,5 +1,5 @@ package com.simple.service.impl; -import com.simple.domain.dto.WxUserCoupon; +import com.simple.domain.dto.WxUserCouponDto; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; import com.simple.mapper.WxCouponMapper; @@ -31,9 +31,9 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { * @return */ @Override - public List findList(Long userId, int status) { + public List findList(Long userId, int status) { //TODO 待测试优化 - List wxUserCoupons = new ArrayList<>(); + List wxUserCoupons = new ArrayList<>(); //查询订单表 WxOrder wxOrder = new WxOrder(); wxOrder.setCUserId(userId); @@ -52,8 +52,8 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { } return wxUserCoupons; } - public WxUserCoupon getWxUserCoupon(WxOrder wxOrder,String title){ - WxUserCoupon wxUserCoupon = new WxUserCoupon(); + public WxUserCouponDto getWxUserCoupon(WxOrder wxOrder, String title){ + WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); wxUserCoupon.setOrderId(wxOrder.getId()); wxUserCoupon.setcUserId(wxOrder.getCUserId()); wxUserCoupon.setCouponId(wxOrder.getCouponId()); From fdbf8a29ca5fe663287b50f555f87fb2659baa89 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 22:14:09 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCclientApi/pom.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mallinkCclientApi/pom.xml b/mallinkCclientApi/pom.xml index 171a06129..0e7f141ff 100644 --- a/mallinkCclientApi/pom.xml +++ b/mallinkCclientApi/pom.xml @@ -22,12 +22,10 @@ - org.apache.maven.plugins - maven-compiler-plugin - 3.1 + org.springframework.boot + spring-boot-maven-plugin - 1.8 - 1.8 + true From 0692662427d4282abc7c9f0261b0dbac1a3badf5 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 22:19:31 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback.xml | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 mallinkCclientApi/src/main/resources/logback.xml diff --git a/mallinkCclientApi/src/main/resources/logback.xml b/mallinkCclientApi/src/main/resources/logback.xml new file mode 100644 index 000000000..41e865f70 --- /dev/null +++ b/mallinkCclientApi/src/main/resources/logback.xml @@ -0,0 +1,95 @@ + + + + + + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n + + + + + ${PATH}/trace.log + + logs/trace.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + + + ${PATH}/info.log + + logs/info.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + INFO + ACCEPT + DENY + + + + + ${PATH}/debug.log + + logs/debug.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + DEBUG + ACCEPT + DENY + + + + + + ${PATH}/warn.log + + logs/warn.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + WARN + ACCEPT + DENY + + + + + + + ${PATH}/error.log + + logs/error.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + \ No newline at end of file From be6fed4d5dc633f91e4d4b3b3145aa556f71ac5e Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 22:45:35 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=8A=B5=E6=9F=A5=E8=AF=A2=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 --- .../simple/controller/WxCouponController.java | 30 +++++++++++++++---- .../java/com/simple/domain/po/WxCoupon.java | 12 ++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index e0802816c..7063fb2d8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -1,26 +1,39 @@ package com.simple.controller; +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 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.po.WxCoupon; +import com.simple.domain.po.WxMerchant; 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; @RestController @RequestMapping("wxCoupon") +@Api(description="优惠券接口") public class WxCouponController extends BaseController { @Autowired private WxCouponService wxCouponService; + + @Autowired + private WxMerchantService wxMerchantService; private Logger logger = Logger.getLogger(WxCouponController.class); @@ -43,7 +56,11 @@ public class WxCouponController extends BaseController public ResultData add(@RequestBody WxCoupon wxCoupon) { //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponService.saveOrUpdate(wxCoupon); + if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { + String[] arys = wxCoupon.getBusiness().split(","); + wxCoupon.setBusiness(JSON.toJSONString(arys)); + } + wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(); } @@ -66,7 +83,10 @@ public class WxCouponController 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,"查询成功",wxCouponService.getById(id)); + WxCoupon c = wxCouponService.getById(id); + WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); + c.setWxMerchant(merchant); + return new ResultData(Result.SUCCESS,"查询成功",c); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java index cbe651cd7..b2b295daa 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -119,6 +119,18 @@ public class WxCoupon implements Serializable { /*业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") private String business; + + @Transient + private WxMerchant wxMerchant; + + public WxMerchant getWxMerchant() { + return wxMerchant; + } + + public void setWxMerchant(WxMerchant wxMerchant) { + this.wxMerchant = wxMerchant; + } + public String getTenantId() { return tenantId; } From 4784d48bc9cdf80b12906b8e46dea00b532c53c6 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 23:07:46 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=20=E4=B8=9A=E6=80=81=E7=9A=84json=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponController.java | 7 +++++++ mallinkAdmin/src/main/resources/application-dev.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 7063fb2d8..f50e5f0e6 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -67,6 +67,13 @@ public class WxCouponController extends BaseController @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)); + } wxCouponService.saveOrUpdate(wxCoupon); return new ResultData(); } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index f32db38e0..5c5754a03 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -20,8 +20,8 @@ spring: poolPreparedStatements: true maxOpenPreparedStatements: 20 connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" - jackson: - date-format: yyyy-MM-dd HH:mm:ss + #jackson: + #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: From 7c0954c6e52a0a647e3ae9f37426f647f72f3200 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 10 Aug 2018 23:22:45 +0800 Subject: [PATCH 10/10] upd --- .../src/main/resources/application-dev.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkCclientApi/src/main/resources/application-dev.yml b/mallinkCclientApi/src/main/resources/application-dev.yml index 8bcd356f3..c40f720f9 100644 --- a/mallinkCclientApi/src/main/resources/application-dev.yml +++ b/mallinkCclientApi/src/main/resources/application-dev.yml @@ -1,9 +1,9 @@ spring: # JDBC datasource: - url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false - username: root - password: root + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false + username: mallone + password: m@1l0ne123@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -19,20 +19,20 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - jackson: - date-format: yyyy-MM-dd HH:mm:ss + #jackson: + #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 127.0.0.1 - port: 6379 + host: 202.165.179.86 + port: 6789 + password: JGtest123 timeout: 0 expire: 1800 #30分钟 pool: max-active: 8 max-idle: 8 max-wait: -1 - min-idle: 0 logging: level: