From c92f776546a65ae3626034981dc33035b60d6a80 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 13:41:17 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/common/ErrorCode.java | 13 ++- .../simple/exception/BizMessageException.java | 14 ++++ .../simple/exception/MallinkException.java | 36 +++++++++ .../com/simple/service/WxOrderService.java | 2 +- .../service/impl/WxOrderServiceImpl.java | 80 +++++++++++++++---- 5 files changed, 127 insertions(+), 18 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/exception/BizMessageException.java create mode 100644 mallinkService/src/main/java/com/simple/exception/MallinkException.java diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 0c10fe3af..17ca543de 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -40,7 +40,18 @@ public enum ErrorCode{ USER_IS_EMPTY(2000, "用户不存在"), PASSWORD_ERROR(2001, "密码错误"), LOGIN_USER_OR_PWD_ERROR(2002, "用户名或密码错误"), - USER_IS_LOCKED(2003, "用户已经被锁定不能登录,请与管理员联系"); + USER_IS_LOCKED(2003, "用户已经被锁定不能登录,请与管理员联系"), + + /** + * 订单 + */ + REMAIN_IS_EMPTY(12000, "库存不足"), + ORDER_IS_FAIL(12001, "订单创建失败"), + ORDER_IS_NOT_FIND(12002, "订单不存在"); + + /** + * 支付 + */ diff --git a/mallinkService/src/main/java/com/simple/exception/BizMessageException.java b/mallinkService/src/main/java/com/simple/exception/BizMessageException.java new file mode 100644 index 000000000..6e6f0b477 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/exception/BizMessageException.java @@ -0,0 +1,14 @@ +package com.simple.exception; + +/** + * Created by Stormeye on 2018/8/10. + */ +public class BizMessageException extends RuntimeException { + public BizMessageException() { + super(); + } + + public BizMessageException(String bizMessage) { + super(bizMessage); + } +} diff --git a/mallinkService/src/main/java/com/simple/exception/MallinkException.java b/mallinkService/src/main/java/com/simple/exception/MallinkException.java new file mode 100644 index 000000000..0396cb0f5 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/exception/MallinkException.java @@ -0,0 +1,36 @@ +package com.simple.exception; + +import com.simple.common.ErrorCode; + +/** + * Created by Stormeye on 2018/8/10. + */ +public class MallinkException extends RuntimeException { + + private int errorCode; + private String message; + + public MallinkException(int errorC, String message) { + this.errorCode = errorC; + this.message = message; + } + + public MallinkException(ErrorCode errCode) { + this.errorCode = errCode.getCode(); + this.message = errCode.getMessage(); + } + + public MallinkException() { + super(); + } + + public int getErrorCode() { + return errorCode; + } + + @Override + public String getMessage() { + return message; + } + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index 984612d9d..a3d9a6bbd 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -29,7 +29,7 @@ public interface WxOrderService { * @param orderId * @param enumOrderStatus */ - void updateOrderStatus(Long orderId,EnumOrderStatus enumOrderStatus); + int updateOrderStatus(Long orderId, EnumOrderStatus enumOrderStatus); /** * 根据Id获得实体 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 3024a8394..34a5073e1 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -1,19 +1,32 @@ package com.simple.service.impl; import java.util.*; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.ErrorCode; +import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; import com.simple.enums.EnumOrderStatus; +import com.simple.exception.MallinkException; +import com.simple.mapper.WxCouponMapper; import com.simple.mapper.WxOrderMapper; import com.simple.service.WxOrderService; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; @Service public class WxOrderServiceImpl implements WxOrderService { - + + private Logger logger = Logger.getLogger(getClass()); + + @Autowired + WxCouponMapper wxCouponMapper; + @Autowired WxOrderMapper wxOrderMapper; @@ -24,25 +37,60 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxOrder saveOrder(WxOrder record) { - // 检查 优惠券 库存 - // 保存订单 - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - record.setStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); - Date curr = new Date(); - record.setCreateDate(curr); - record.setUpdateDate(curr); - wxOrderMapper.insertSelective(record); - return record; + try { + // 检查 优惠券 库存 + WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(record.getCouponId()); + if (coupon.getRemainInventory() <= 0) { + logger.error("coupon not found, couponId: " + record.getCouponId()); + throw new MallinkException(ErrorCode.REMAIN_IS_EMPTY); + } + // 减库存 + coupon.setRemainInventory(coupon.getRemainInventory() - 1); + wxCouponMapper.updateByPrimaryKeySelective(coupon); + + // 保存订单 + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + record.setStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + Date curr = new Date(); + record.setCreateDate(curr); + record.setUpdateDate(curr); + wxOrderMapper.insertSelective(record); + // 返回 record + return record; + } catch (RuntimeException e) { + throw new MallinkException(ErrorCode.ORDER_IS_FAIL); + } } @Override - public void updateOrderStatus(Long orderId,EnumOrderStatus enumOrderStatus) { - WxOrder record = wxOrderMapper.selectByPrimaryKey(orderId); - record.setStatus(enumOrderStatus.getCode()); - record.setUpdateDate(new Date()); - wxOrderMapper.updateByPrimaryKey(record); + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public int updateOrderStatus(Long orderId,EnumOrderStatus enumOrderStatus) { + WxOrder updateRecord = wxOrderMapper.selectByPrimaryKey(orderId); + if (updateRecord == null) { + logger.error("order updateStatus, order not found, orderId:" + updateRecord.getId()); + throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); + } + Date currentDate = new Date(); + // 支付成功 + if (enumOrderStatus == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS) { + updateRecord.setPaymentTime(currentDate); + } + if (enumOrderStatus == EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL) { + //取消订单, 库存加1 + WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(updateRecord.getCouponId()); + if (coupon.getRemainInventory() <= 0) { + logger.error("coupon not found, couponId: " + updateRecord.getCouponId()); + throw new MallinkException(ErrorCode.REMAIN_IS_EMPTY); + } + coupon.setRemainInventory(coupon.getRemainInventory() + 1); + wxCouponMapper.updateByPrimaryKeySelective(coupon); + } + updateRecord.setStatus(enumOrderStatus.getCode()); + updateRecord.setUpdateDate(currentDate); + return wxOrderMapper.updateByPrimaryKey(updateRecord); } @Override From 573e3ed42d2ab1c231c0708737b3d7a2e5360080 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 13:42:07 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/controller/WxOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java index b4604f5fc..b38cec30e 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java @@ -73,7 +73,7 @@ public class WxOrderController extends BaseController public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); return new ResultData(); } From ffb9f25d0660b8a20a6ae922084196da342bad8a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 13:43:11 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/controller/WxOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java index b38cec30e..b4604f5fc 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java @@ -73,7 +73,7 @@ public class WxOrderController extends BaseController public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); return new ResultData(); } From d02ad5569efd67b25a3c472d5315a514b92026ad Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 16:12:24 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 18 ++-- .../controller/WxPayOrderController.java | 3 +- .../simple/controller/WxOrderController.java | 42 ++++----- .../controller/WxPayOrderController.java | 85 ++++++++++++++++++- mallinkService/pom.xml | 15 ---- .../java/com/simple/common/ErrorCode.java | 4 +- .../java/com/simple/domain/po/WxMerchant.java | 24 +++++- .../java/com/simple/domain/po/WxPayOrder.java | 53 ++++++------ .../com/simple/enums/EnumCouponStatus.java | 43 ++++++++++ .../java/com/simple/enums/EnumPayWay.java | 4 +- .../com/simple/service/WxPayOrderService.java | 30 ++++++- .../service/impl/WxOrderServiceImpl.java | 18 +++- .../service/impl/WxPayOrderServiceImpl.java | 69 ++++++++++++++- .../main/java/com/simple/utils/IPUtil.java | 51 +++++++++++ .../resources/mapper/WxMerchantMapper.xml | 14 ++- .../resources/mapper/WxPayOrderMapper.xml | 28 +++--- pom.xml | 13 +++ 17 files changed, 416 insertions(+), 98 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumCouponStatus.java create mode 100644 mallinkService/src/main/java/com/simple/utils/IPUtil.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java index a907ac428..403d43c65 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxOrderController.java @@ -19,18 +19,20 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("wxOrder") public class WxOrderController extends BaseController { + private Logger logger = Logger.getLogger(WxOrderController.class); + @Autowired private WxOrderService wxOrderService; - private Logger logger = Logger.getLogger(WxOrderController.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 WxOrder wxOrder,Integer pageNum, Integer pageSize) { - if (null == wxOrder) wxOrder = new WxOrder(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + if (null == wxOrder) wxOrder = new WxOrder(); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java index 931332516..80ce946a9 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java @@ -19,10 +19,11 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("wxPayOrder") public class WxPayOrderController extends BaseController { + private Logger logger = Logger.getLogger(WxPayOrderController.class); + @Autowired private WxPayOrderService wxPayOrderService; - private Logger logger = Logger.getLogger(WxPayOrderController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java index b4604f5fc..4c2653cf8 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxOrderController.java @@ -18,20 +18,21 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxOrder") -public class WxOrderController extends BaseController -{ - @Autowired +public class WxOrderController extends BaseController { + private Logger logger = Logger.getLogger(WxOrderController.class); + + @Autowired private WxOrderService wxOrderService; - private Logger logger = Logger.getLogger(WxOrderController.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 WxOrder wxOrder,Integer pageNum, Integer pageSize) { - if (null == wxOrder) wxOrder = new WxOrder(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + if (null == wxOrder) wxOrder = new WxOrder(); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } @@ -90,7 +91,7 @@ public class WxOrderController extends BaseController return new ResultData(); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxOrder wxOrder) { //Assert.notNull(wxOrder.getName(), "角色名不能为空"); @@ -108,19 +109,18 @@ public class WxOrderController 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) { wxOrderService.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,"查询成功",wxOrderService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxOrderService.getById(id)); } - - - + + } diff --git a/mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java index 931332516..b0bbf862e 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxPayOrderController.java @@ -1,6 +1,14 @@ package com.simple.controller; +import com.simple.common.ErrorCode; +import com.simple.enums.EnumPayStatus; +import com.simple.enums.EnumPayWay; +import com.simple.exception.BizMessageException; +import com.simple.exception.MallinkException; +import com.simple.pay.WxPayment; +import com.simple.utils.IPUtil; 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.*; @@ -15,14 +23,85 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + @RestController @RequestMapping("wxPayOrder") -public class WxPayOrderController extends BaseController -{ +public class WxPayOrderController extends BaseController { + + private Logger logger = Logger.getLogger(WxPayOrderController.class); + @Autowired private WxPayOrderService wxPayOrderService; - private Logger logger = Logger.getLogger(WxPayOrderController.class); + @ApiOperation(value = "发起微信小程序支付订单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cUserId", value = "用户id", required = true, dataType = "Long"), + @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "payVendor", value = "支付发起渠道:0-微信小程序", defaultValue = "0",required = false, dataType = "Integer") + }) + @RequestMapping(value = "/create", method = RequestMethod.POST) + public ResultData _create(WxPayOrder record, HttpServletRequest request) throws Exception { + logger.info("payment wechat, order create, param : " + record.toString()); + try { + record.setIp(IPUtil.getIpAddr(request)); + return wxPayOrderService.createPayOrder(record, EnumPayWay.PAY_WAY_WECHAT); + } catch (MallinkException e) { + 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()); + } + return new ResultData(ErrorCode.PAYORDER_ERROR.getCode(), ErrorCode.PAYORDER_ERROR.getMessage()); + } + + /** + * + * @return 接收微信异步通知 + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "/notify", method = RequestMethod.POST) + public String __doNotify(HttpServletRequest request) throws Exception { + Map paramMap = null; + String response; + try { + String xml = IOUtils.toString(request.getInputStream()); + paramMap = WxPayment.xmlToMap(xml); + logger.info("payment wxpay, notify, param: " + paramMap.toString() ); + response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); + logger.info("payment wxpay, notify success, req : " + paramMap.toString() + ", resp: " + response.toString()); + return response; + } catch (BizMessageException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" + e.getLocalizedMessage()); + return e.getMessage(); + } catch (MallinkException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" +e.getLocalizedMessage()); + return e.getMessage(); + } catch (Exception e) { + logger.error("payment wxpay, order create error, req: " + paramMap.toString() + ", e: " + e.getMessage()); + return e.getMessage(); + } + } + + /** + * + * @return 同步回调(订单状态主动检查) + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "callback", method = {RequestMethod.GET, RequestMethod.POST}) + public String __doCallback(HttpServletRequest request) throws Exception { + + logger.info("payment wxpay, callback,request:" + request.toString()); + + return "\n" + + "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + "\n"; + } @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml index cccc06ba6..47ddf2151 100644 --- a/mallinkService/pom.xml +++ b/mallinkService/pom.xml @@ -10,19 +10,4 @@ 4.0.0 mallinkService - - - - - com.squareup.okhttp3 - okhttp - 3.11.0 - - - - org.dom4j - dom4j - 2.1.1 - - \ No newline at end of file diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 17ca543de..cf3c4ff8d 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -47,7 +47,9 @@ public enum ErrorCode{ */ REMAIN_IS_EMPTY(12000, "库存不足"), ORDER_IS_FAIL(12001, "订单创建失败"), - ORDER_IS_NOT_FIND(12002, "订单不存在"); + ORDER_IS_NOT_FIND(12002, "订单不存在"), + ORDER_IS_NOT_PAY(12003, "订单已不能进行支付"), + PAYORDER_ERROR(12004, "支付订单异常"); /** * 支付 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 812064e59..4fdec229c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -59,8 +59,8 @@ public class WxMerchant implements Serializable { /*银行开户行**/ @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") private String bankName; - /*微信支付账号**/ - @io.swagger.annotations.ApiModelProperty(value="微信支付账号",name="wxchatAccount") + /*微信收款账号**/ + @io.swagger.annotations.ApiModelProperty(value="微信收款账号",name="wxchatAccount") private String wxchatAccount; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @@ -68,6 +68,12 @@ public class WxMerchant implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + /*停车厂商(1:ETCP)**/ + @io.swagger.annotations.ApiModelProperty(value="停车厂商(1:ETCP)",name="carVendorType") + private Integer carVendorType; + /*停车厂商参数**/ + @io.swagger.annotations.ApiModelProperty(value="停车厂商参数",name="carParams") + private String carParams; public String getTenantId() { return tenantId; } @@ -122,6 +128,18 @@ public class WxMerchant implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } + public Integer getCarVendorType() { + return carVendorType; + } + public void setCarVendorType(Integer _carVendorType) { + carVendorType = _carVendorType; + } + public String getCarParams() { + return carParams; + } + public void setCarParams(String _carParams) { + carParams = _carParams; + } @@ -137,6 +155,8 @@ public class WxMerchant implements Serializable { ,WxchatAccount_ASC("`wxchatAccount` ASC"),WxchatAccount_DESC("`wxchatAccount` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,CarVendorType_ASC("`carVendorType` ASC"),CarVendorType_DESC("`carVendorType` DESC") + ,CarParams_ASC("`carParams` ASC"),CarParams_DESC("`carParams` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java index 226fe07ab..bf72c7655 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java @@ -56,6 +56,9 @@ public class WxPayOrder implements Serializable { /*用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; + /*支付IP**/ + @io.swagger.annotations.ApiModelProperty(value="支付IP",name="ip") + private String ip; /*支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") private Integer payAmount; @@ -65,18 +68,15 @@ public class WxPayOrder implements Serializable { /*支付结束时间(秒)**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间(秒)",name="payTimeEnd") private Integer payTimeEnd; - /*支付渠道: 0-微信小程序**/ - @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信小程序",name="payChannel") - private Integer payChannel; - /*支付方式: 0-微信小程序支付**/ - @io.swagger.annotations.ApiModelProperty(value="支付方式: 0-微信小程序支付",name="payWay") - private Integer payWay; + /*支付渠道: 0-微信小程序 1--支付宝 2--银联 **/ + @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信小程序 1--支付宝 2--银联 ",name="payVendor") + private Integer payVendor; /*支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") private String payOrderNo; /*支付状态: 0-支付中;1-支付成功;2-支付失败**/ - @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") + private Integer payOrderStatus; /*支付失败原因**/ @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") private String failReason; @@ -110,6 +110,15 @@ public class WxPayOrder implements Serializable { public void setCUserId(Long _cUserId) { cUserId = _cUserId; } + + public String getIp() { + return ip; + } + + public void setIp(String _ip) { + this.ip = _ip; + } + public Integer getPayAmount() { return payAmount; } @@ -128,17 +137,11 @@ public class WxPayOrder implements Serializable { public void setPayTimeEnd(Integer _payTimeEnd) { payTimeEnd = _payTimeEnd; } - public Integer getPayChannel() { - return payChannel; - } - public void setPayChannel(Integer _payChannel) { - payChannel = _payChannel; - } - public Integer getPayWay() { - return payWay; + public Integer getPayVendor() { + return payVendor; } - public void setPayWay(Integer _payWay) { - payWay = _payWay; + public void setPayVendor(Integer _payVendor) { + payVendor = _payVendor; } public String getPayOrderNo() { return payOrderNo; @@ -146,11 +149,11 @@ public class WxPayOrder implements Serializable { public void setPayOrderNo(String _payOrderNo) { payOrderNo = _payOrderNo; } - public Integer getStatus() { - return status; + public Integer getPayOrderStatus() { + return payOrderStatus; } - public void setStatus(Integer _status) { - status = _status; + public void setPayOrderStatus(Integer _payOrderStatus) { + payOrderStatus = _payOrderStatus; } public String getFailReason() { return failReason; @@ -169,13 +172,13 @@ public class WxPayOrder implements Serializable { ,UpdateTime_ASC("`updateTime` ASC"),UpdateTime_DESC("`updateTime` DESC") ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") + ,IP_ASC("`ip` ASC"),IP_DESC("`ip` DESC") ,PayAmount_ASC("`payAmount` ASC"),PayAmount_DESC("`payAmount` DESC") ,PayTimeStart_ASC("`payTimeStart` ASC"),PayTimeStart_DESC("`payTimeStart` DESC") ,PayTimeEnd_ASC("`payTimeEnd` ASC"),PayTimeEnd_DESC("`payTimeEnd` DESC") - ,PayChannel_ASC("`payChannel` ASC"),PayChannel_DESC("`payChannel` DESC") - ,PayWay_ASC("`payWay` ASC"),PayWay_DESC("`payWay` DESC") + ,PayVendor_ASC("`payVendor` ASC"),PayVendor_DESC("`payVendor` DESC") ,PayOrderNo_ASC("`payOrderNo` ASC"),PayOrderNo_DESC("`payOrderNo` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,PayOrderStatus_ASC("`payOrderStatus` ASC"),PayOrderStatus_DESC("`payOrderStatus` DESC") ,FailReason_ASC("`failReason` ASC"),FailReason_DESC("`failReason` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/simple/enums/EnumCouponStatus.java b/mallinkService/src/main/java/com/simple/enums/EnumCouponStatus.java new file mode 100644 index 000000000..6fd5739be --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumCouponStatus.java @@ -0,0 +1,43 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCouponStatus { + + // 0-草稿/待生效;1-已生效/已发布/已投放;2-已下架;3-已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券 + + COUPON_STATUS_DRAFT(0, "草稿"), + COUPON_STATUS_THROW_IN(1, "已投放"), + COUPON_STATUS_TAKE_OFFF(2, "已下架"), + COUPON_STATUS_NOT_USED(3, "未使用"), + COUPON_STATUS_USED(4,"已使用"), + COUPON_STATUS_OVER_TIME(5, "已过期"), + COUPON_STATUS_BACKED(6, "已退券") + ; + + public static EnumCouponStatus getEnum(Integer code) { + for (EnumCouponStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCouponStatus(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/EnumPayWay.java b/mallinkService/src/main/java/com/simple/enums/EnumPayWay.java index 0910ea091..94d027b05 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumPayWay.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumPayWay.java @@ -7,9 +7,9 @@ public enum EnumPayWay { PAY_WAY_WEAPP(0, "微信小程序"), PAY_WAY_WECHAT(1, "微信支付"), - PAY_WAY_WECHAT_WAP(2, "微信h5"), + PAY_WAY_WECHAT_WAP(2, "微信H5"), PAY_WAY_ALIPAY(3, "支付宝"), - PAY_WAY_ALIPAY_WAP(0, "支付宝h5"); + PAY_WAY_ALIPAY_WAP(4, "支付宝H5"); public static EnumPayWay getEnum(Integer code) { for (EnumPayWay value : values()) { diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index b45c38a97..0ab5d0ff0 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -2,16 +2,42 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.po.WxPayOrder; +import com.simple.enums.EnumPayWay; public interface WxPayOrderService { + /** + * 创建支付订单 + * @param record 支付订单请求 + * @param payWay + * @return + */ + ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay); + + /** + * 异步通知 + * @param paramMap 异步通知参数 + * @param payWay 支付方式 + * @return + */ + String notify(Map paramMap, EnumPayWay payWay); + + /** + * 页面回调 + * @param paramMap 页面通知参数 + * @param payWay 支付方式 + * @return + */ + void callback(Map paramMap, EnumPayWay payWay); + /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize); 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..1d79cda00 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -74,12 +74,14 @@ public class WxOrderServiceImpl implements WxOrderService { throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } Date currentDate = new Date(); - // 支付成功 + + // 0:待付款 + // 1:已支付 if (enumOrderStatus == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS) { updateRecord.setPaymentTime(currentDate); } + // 2:已取消, 库存加1 if (enumOrderStatus == EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL) { - //取消订单, 库存加1 WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(updateRecord.getCouponId()); if (coupon.getRemainInventory() <= 0) { logger.error("coupon not found, couponId: " + updateRecord.getCouponId()); @@ -88,6 +90,18 @@ public class WxOrderServiceImpl implements WxOrderService { coupon.setRemainInventory(coupon.getRemainInventory() + 1); wxCouponMapper.updateByPrimaryKeySelective(coupon); } + // 3:待退款 + // 4:已退款 + if (enumOrderStatus == EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS) { + WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(updateRecord.getCouponId()); + if (coupon.getRemainInventory() <= 0) { + logger.error("coupon not found, couponId: " + updateRecord.getCouponId()); + throw new MallinkException(ErrorCode.REMAIN_IS_EMPTY); + } + coupon.setRemainInventory(coupon.getRemainInventory() + 1); + wxCouponMapper.updateByPrimaryKeySelective(coupon); + } + // 5:退款失败 updateRecord.setStatus(enumOrderStatus.getCode()); updateRecord.setUpdateDate(currentDate); return wxOrderMapper.updateByPrimaryKey(updateRecord); 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 1cfd1e8a1..8f9e9fed0 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -1,21 +1,88 @@ package com.simple.service.impl; +import java.math.BigDecimal; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.ErrorCode; +import com.simple.common.ResultData; +import com.simple.domain.po.WxOrder; import com.simple.domain.po.WxPayOrder; +import com.simple.enums.EnumOrderStatus; +import com.simple.enums.EnumPayStatus; +import com.simple.enums.EnumPayWay; +import com.simple.exception.BizMessageException; +import com.simple.exception.MallinkException; +import com.simple.mapper.WxOrderMapper; import com.simple.mapper.WxPayOrderMapper; +import com.simple.service.WxOrderService; import com.simple.service.WxPayOrderService; +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; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; @Service public class WxPayOrderServiceImpl implements WxPayOrderService { - + + private Logger logger = Logger.getLogger(getClass()); + + @Autowired + WxOrderMapper wxOrderMapper; @Autowired WxPayOrderMapper wxPayOrderMapper; + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay) { + try { + // 1. check 订单 + WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + if (order == null) { + logger.warn("pay order, order not allow, repaymentReq: " + record.toString() +", payWay: " + payWay.toString()); + throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); + } + if (order.getStatus() != EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()) { + logger.warn("pay order, order status not allow, repaymentReq: " + order.toString() + " , payWay: " + payWay.toString()); + throw new MallinkException(ErrorCode.ORDER_IS_NOT_PAY); + } + // 2. 创建支付订单 + Date currentDate = new Date(); + final IdWorker idworker = IdWorker.get(); + Long id = idworker.nextId(); + record.setId(id); + record.setCreateTime(currentDate); + record.setUpdateTime(currentDate); + int currentTime = Utility.convertDate2TimeStamp(currentDate); + record.setPayTimeStart(currentTime); + record.setPayTimeEnd(currentTime); + // 支付单号 + record.setPayOrderNo(String.valueOf(id)); + BigDecimal pl = order.getPayment().multiply(new BigDecimal(100)); + record.setPayAmount(pl.intValue()); + record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); + record.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); + + wxPayOrderMapper.insertSelective(record); + return new ResultData(record); + } catch (RuntimeException e) { + throw new MallinkException(ErrorCode.PAYORDER_ERROR); + } + } + + @Override + public String notify(Map paramMap, EnumPayWay payWay) { + return ""; + } + + @Override + public void callback(Map paramMap, EnumPayWay payWay) { + + } + @Override public PageInfo listAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize) { diff --git a/mallinkService/src/main/java/com/simple/utils/IPUtil.java b/mallinkService/src/main/java/com/simple/utils/IPUtil.java new file mode 100644 index 000000000..b3da3efe2 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/utils/IPUtil.java @@ -0,0 +1,51 @@ +package com.simple.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; + +public class IPUtil { + private final static Logger logger = LoggerFactory.getLogger(IPUtil.class); + + + public static String getIpAddr(HttpServletRequest request) { + String ipAddress = request.getHeader("x-forwarded-for"); + if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || "unknow".equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("WL-Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("HTTP_CLIENT_IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { + ipAddress = request.getRemoteAddr(); + if (ipAddress.equals("127.0.0.1") || ipAddress.equals("0:0:0:0:0:0:0:1")) { + //根据网卡获取本机配置的IP地址 + InetAddress inetAddress = null; + try { + inetAddress = InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + logger.error(e.getMessage()); + } + ipAddress = inetAddress.getHostAddress(); + } + } + //对于通过多个代理的情况,第一个IP为客户端真实的IP地址,多个IP按照','分割 + if (null != ipAddress && ipAddress.length() > 15) { + //"***.***.***.***".length() = 15 + if (ipAddress.indexOf(",") > 0) { + ipAddress = ipAddress.substring(0, ipAddress.indexOf(",")); + } + } + + return ipAddress; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index d69c3e923..5b0e30a3e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -12,10 +12,12 @@ + + - `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`wxchat_account`,`create_date`,`update_date` + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`wxchat_account`,`create_date`,`update_date`,`car_vendor_type`,`car_params` @@ -69,6 +71,16 @@ and `update_date` = #{updateDate} + + + + and `car_vendor_type` = #{carVendorType} + + + + + and `car_params` like concat('%', #{carParams},'%') + and id in diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 7cb141916..9eb4b672b 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -8,18 +8,18 @@ + - - + - + - `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`pay_amount`,`pay_time_start`,`pay_time_end`,`pay_channel`,`pay_way`,`pay_order_no`,`status`,`fail_reason` + `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`pay_amount`,`pay_time_start`,`pay_time_end`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason` @@ -53,7 +53,12 @@ and `c_user_id` = #{cUserId} - + + + + and `ip` = #{ip} + + and `pay_amount` = #{payAmount} @@ -70,13 +75,8 @@ - - and `pay_channel` = #{payChannel} - - - - - and `pay_way` = #{payWay} + + and `pay_vendor` = #{payVendor} @@ -85,8 +85,8 @@ - - and `status` = #{status} + + and `pay_order_status` = #{payOrderStatus} diff --git a/pom.xml b/pom.xml index 251dde958..87b0c02a2 100644 --- a/pom.xml +++ b/pom.xml @@ -188,6 +188,19 @@ 3.15 + + + com.squareup.okhttp3 + okhttp + 3.11.0 + + + + org.dom4j + dom4j + 2.1.1 + + From f00bb44dd63f0daafbdb7bf0379fee32854043a8 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 16:19:33 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 9eb4b672b..6901803d5 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -8,7 +8,7 @@ - + From e2fe03a8cb95ce76e6afee0fc713db114c466397 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Fri, 10 Aug 2018 17:12:49 +0800 Subject: [PATCH 06/27] =?UTF-8?q?order=E8=A1=A8=20=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/po/WxOrder.java | 14 ++++++++++++-- .../src/main/resources/mapper/WxOrderMapper.xml | 8 +++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxOrder.java index fb61f508c..bc0a99e15 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrder.java @@ -62,6 +62,9 @@ public class WxOrder implements Serializable { /*券状态(3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券 )**/ @io.swagger.annotations.ApiModelProperty(value="券状态(3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券 )",name="couponStatus") private Integer couponStatus; + /*卡券过期时间**/ + @io.swagger.annotations.ApiModelProperty(value="卡券过期时间",name="validDate") + private Date validDate; /*有无退款(0: 无, 1:有)**/ @io.swagger.annotations.ApiModelProperty(value="有无退款(0: 无, 1:有)",name="refund") private Integer refund; @@ -116,6 +119,12 @@ public class WxOrder implements Serializable { public void setCouponStatus(Integer _couponStatus) { couponStatus = _couponStatus; } + public Date getValidDate() { + return validDate; + } + public void setValidDate(Date _validDate) { + validDate = _validDate; + } public Integer getRefund() { return refund; } @@ -153,6 +162,7 @@ public class WxOrder implements Serializable { ,PaymentTime_ASC("`paymentTime` ASC"),PaymentTime_DESC("`paymentTime` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,CouponStatus_ASC("`couponStatus` ASC"),CouponStatus_DESC("`couponStatus` DESC") + ,ValidDate_ASC("`validDate` ASC"),ValidDate_DESC("`validDate` DESC") ,Refund_ASC("`refund` ASC"),Refund_DESC("`refund` DESC") ,RefundTime_ASC("`refundTime` ASC"),RefundTime_DESC("`refundTime` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") @@ -174,7 +184,7 @@ public class WxOrder implements Serializable { } } - public void setSortColumns(WxOrder.Field... fields) + public void setSortColumns(Field... fields) { if (fields == null || fields.length == 0) { return; @@ -199,7 +209,7 @@ public class WxOrder implements Serializable { } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f2fae3c50..baaf5b3a0 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -10,6 +10,7 @@ + @@ -17,7 +18,7 @@ - `id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`payment_time`,`status`,`coupon_status`,`refund`,`refund_time`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`payment_time`,`status`,`coupon_status`,`validDate`,`refund`,`refund_time`,`create_date`,`update_date` @@ -63,6 +64,11 @@ + + and `validDate` = #{validDate} + + + and `refund` = #{refund} From 5b4666d10717254f5f096b97df567c6da210de49 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 18:00:27 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 9 +- mallinkApi/src/main/resources/application.yml | 2 +- .../java/com/simple/common/ErrorCode.java | 3 +- .../com/simple/service/WxPayOrderService.java | 2 + .../service/impl/WxPayOrderServiceImpl.java | 124 +++++++++++++++++- .../main/java/com/simple/utils/Utility.java | 5 + 6 files changed, 138 insertions(+), 7 deletions(-) diff --git a/mallinkApi/src/main/resources/application-dev.yml b/mallinkApi/src/main/resources/application-dev.yml index 8bcd356f3..9878c17ce 100644 --- a/mallinkApi/src/main/resources/application-dev.yml +++ b/mallinkApi/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:63306/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 @@ -25,7 +25,8 @@ spring: # REDIS redis: host: 127.0.0.1 - port: 6379 + port: 6789 + password: JGtest123 timeout: 0 expire: 1800 #30分钟 pool: diff --git a/mallinkApi/src/main/resources/application.yml b/mallinkApi/src/main/resources/application.yml index bec78e171..74ae8cbee 100644 --- a/mallinkApi/src/main/resources/application.yml +++ b/mallinkApi/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9000 + port: 9001 context-path: / spring: diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index cf3c4ff8d..50bf0e156 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -49,7 +49,8 @@ public enum ErrorCode{ ORDER_IS_FAIL(12001, "订单创建失败"), ORDER_IS_NOT_FIND(12002, "订单不存在"), ORDER_IS_NOT_PAY(12003, "订单已不能进行支付"), - PAYORDER_ERROR(12004, "支付订单异常"); + PAYORDER_ERROR(12004, "支付订单异常"), + PAYORDER_NOTIFY_CHECK_SIGN_ERROR(12005 , "验签失败"); /** * 支付 diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 0ab5d0ff0..21ba7ce49 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -16,6 +16,8 @@ public interface WxPayOrderService { */ ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay); + void handleOrderPaySuccess(WxPayOrder record, String tradeNo); + /** * 异步通知 * @param paramMap 异步通知参数 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 8f9e9fed0..94209e9ca 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -15,15 +15,18 @@ import com.simple.exception.BizMessageException; import com.simple.exception.MallinkException; import com.simple.mapper.WxOrderMapper; import com.simple.mapper.WxPayOrderMapper; +import com.simple.pay.WxPayment; import com.simple.service.WxOrderService; import com.simple.service.WxPayOrderService; import com.simple.utils.Utility; +import com.simple.utils.XmlUtil; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import tk.mybatis.mapper.entity.Example; @Service public class WxPayOrderServiceImpl implements WxPayOrderService { @@ -32,11 +35,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Autowired WxOrderMapper wxOrderMapper; + @Autowired WxPayOrderMapper wxPayOrderMapper; + @Autowired + WxOrderService wxOrderService; + @Override - @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay) { try { // 1. check 订单 @@ -75,6 +81,81 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override public String notify(Map paramMap, EnumPayWay payWay) { + // how to get wechatAppId, wechatMchId, partnerKey + String wechatAppId = ""; + String wechatMchId = ""; + String partnerKey = ""; + try { + if (payWay == EnumPayWay.PAY_WAY_WEAPP) { + boolean signVerified = false; + if (payWay == EnumPayWay.PAY_WAY_WECHAT) { + // 微信支付 + signVerified = WxPayment.verifyNotify(paramMap, partnerKey); + } + if (!signVerified) { + logger.warn("notify order, wxpay checksign error, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + throw new MallinkException(ErrorCode.PAYORDER_NOTIFY_CHECK_SIGN_ERROR); + } + if (!"SUCCESS".equals(paramMap.get("return_code"))) { + logger.warn("notify order, wxpay status not success, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "订单状态码非SUCCESS"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + if (!wechatAppId.equals(paramMap.get("appid"))) { + logger.warn("notify order, wxpay appid is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "非法请求appid"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + if (!(wechatMchId.equals(paramMap.get("mch_id")))) { + logger.warn("notify order, wxpay mch_id is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "非法请求mch_id"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + + if (!"SUCCESS".equals(paramMap.get("result_code"))) { + logger.warn("notify order, wxpay result_code is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "result_code fail"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + String payOrderNo = paramMap.get("out_trade_no"); + Long payOrderId = Long.valueOf(payOrderNo); + WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); + if (payOrder == null) { + logger.warn("notify order, wxpay check pay order not exists, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "订单不存在"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + // 验证支付金额 + if(!paramMap.get("total_fee").equals(payOrder.getPayAmount().toString())) { + logger.warn("notify order, wxpay check total_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", "订单总金额不一致"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + + // 处理支付成功 + handleOrderPaySuccess(payOrder, paramMap.get("transaction_id")); + logger.info("notify order, wxpay checksign success, paramMap:{}, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + Map resultMap = new LinkedHashMap<>(); + resultMap.put("return_code", "SUCCESS"); + resultMap.put("return_msg", "OK"); + return XmlUtil.parseDto2Xml(resultMap, ""); + } + } catch (RuntimeException e) { + logger.warn("notify order, alipay checksign error, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); + throw new MallinkException(ErrorCode.PAYORDER_NOTIFY_CHECK_SIGN_ERROR); + } return ""; } @@ -83,6 +164,47 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void handleOrderPaySuccess(WxPayOrder record, String tradeNo) { + EnumPayStatus payStatus = EnumPayStatus.getEnum(record.getPayOrderStatus()); + // 判断支付状态 + if (payStatus != EnumPayStatus.PAY_WAY_WAIT) { + logger.error("pay success handle, payOrder " + record.getPayOrderNo() + + "is paid success , orderId : " + record.getOrderId()); + return; + } + WxOrder order = wxOrderMapper.selectByPrimaryKey(record.getOrderId()); + if (order == null) { + logger.error("pay success handle, order " + record.getOrderId() +" not found , payOrderGid : " + record.getPayOrderNo()); + throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); + } + + // 修改订单状态 + wxOrderService.updateOrderStatus(order.getId(), EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS); + + // 修改支付订单状态 + Date currentDate = new Date(); + WxPayOrder updatePayOrder = new WxPayOrder(); + updatePayOrder.setId(record.getId()); + updatePayOrder.setOrderId(record.getOrderId()); + updatePayOrder.setUpdateTime(currentDate); + updatePayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); + //updatePayOrder.setTradeNo(tradeNo); + wxPayOrderMapper.updateByPrimaryKeySelective(updatePayOrder); + + Map msgMap = new HashMap<>(); + try { + msgMap.put("name", String.valueOf(order.getCouponId())); + msgMap.put("orderNo", String.valueOf(order.getId())); + msgMap.put("createTime", Utility.getDataFormatString3(order.getCreateDate())); + msgMap.put("standingTime", order.getCreateDate() + "-" + currentDate ); + //smsSenderHandler.sendSms("SMS_18195394", order.getMobile(), msgMap); + } catch (Exception e) { + logger.error("pay success handle, sms send exception, payOrderi: " + updatePayOrder+ ", msgMap: " + msgMap.toString() + ", e: " + e.getMessage()); + } + } + @Override public PageInfo listAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize) { diff --git a/mallinkService/src/main/java/com/simple/utils/Utility.java b/mallinkService/src/main/java/com/simple/utils/Utility.java index 347d70676..e86068665 100644 --- a/mallinkService/src/main/java/com/simple/utils/Utility.java +++ b/mallinkService/src/main/java/com/simple/utils/Utility.java @@ -254,6 +254,11 @@ public final class Utility { return sf.format(((long) currentSec) * 1000); } + public static String getDataFormatString3(Date date) { + SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日"); + return sf.format(date); + } + public static String convertDecimal2PercentRate(BigDecimal rate) { NumberFormat percent = NumberFormat.getPercentInstance(); percent.setMaximumFractionDigits(1); From 8575f3b5deafcb3e8d3e4b4b936123f997844d41 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 10 Aug 2018 18:12:31 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxPayOrder.java | 27 ++++++++++++------- .../com/simple/service/WxPayOrderService.java | 2 +- .../service/impl/WxPayOrderServiceImpl.java | 5 ++-- .../resources/mapper/WxPayOrderMapper.xml | 20 +++++++++----- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java index bf72c7655..c96195185 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java @@ -56,8 +56,8 @@ public class WxPayOrder implements Serializable { /*用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; - /*支付IP**/ - @io.swagger.annotations.ApiModelProperty(value="支付IP",name="ip") + /*ip地址**/ + @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; /*支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") @@ -68,8 +68,11 @@ public class WxPayOrder implements Serializable { /*支付结束时间(秒)**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间(秒)",name="payTimeEnd") private Integer payTimeEnd; - /*支付渠道: 0-微信小程序 1--支付宝 2--银联 **/ - @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信小程序 1--支付宝 2--银联 ",name="payVendor") + /*微信生成的订单号**/ + @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") + private String transactionId; + /*支付渠道: 0-微信 1-支付宝 2-银联 **/ + @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") private Integer payVendor; /*支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") @@ -110,15 +113,12 @@ public class WxPayOrder implements Serializable { public void setCUserId(Long _cUserId) { cUserId = _cUserId; } - - public String getIp() { + public String getIp() { return ip; } - public void setIp(String _ip) { - this.ip = _ip; + ip = _ip; } - public Integer getPayAmount() { return payAmount; } @@ -137,6 +137,12 @@ public class WxPayOrder implements Serializable { public void setPayTimeEnd(Integer _payTimeEnd) { payTimeEnd = _payTimeEnd; } + public String getTransactionId() { + return transactionId; + } + public void setTransactionId(String _transactionId) { + transactionId = _transactionId; + } public Integer getPayVendor() { return payVendor; } @@ -172,10 +178,11 @@ public class WxPayOrder implements Serializable { ,UpdateTime_ASC("`updateTime` ASC"),UpdateTime_DESC("`updateTime` DESC") ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") - ,IP_ASC("`ip` ASC"),IP_DESC("`ip` DESC") + ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") ,PayAmount_ASC("`payAmount` ASC"),PayAmount_DESC("`payAmount` DESC") ,PayTimeStart_ASC("`payTimeStart` ASC"),PayTimeStart_DESC("`payTimeStart` DESC") ,PayTimeEnd_ASC("`payTimeEnd` ASC"),PayTimeEnd_DESC("`payTimeEnd` DESC") + ,TransactionId_ASC("`transactionId` ASC"),TransactionId_DESC("`transactionId` DESC") ,PayVendor_ASC("`payVendor` ASC"),PayVendor_DESC("`payVendor` DESC") ,PayOrderNo_ASC("`payOrderNo` ASC"),PayOrderNo_DESC("`payOrderNo` DESC") ,PayOrderStatus_ASC("`payOrderStatus` ASC"),PayOrderStatus_DESC("`payOrderStatus` DESC") diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 21ba7ce49..a012a791e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -16,7 +16,7 @@ public interface WxPayOrderService { */ ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay); - void handleOrderPaySuccess(WxPayOrder record, String tradeNo); + void handleOrderPaySuccess(WxPayOrder record, String transactionId); /** * 异步通知 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 94209e9ca..3e7198deb 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -166,7 +166,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void handleOrderPaySuccess(WxPayOrder record, String tradeNo) { + public void handleOrderPaySuccess(WxPayOrder record, String transactionId) { EnumPayStatus payStatus = EnumPayStatus.getEnum(record.getPayOrderStatus()); // 判断支付状态 if (payStatus != EnumPayStatus.PAY_WAY_WAIT) { @@ -190,7 +190,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { updatePayOrder.setOrderId(record.getOrderId()); updatePayOrder.setUpdateTime(currentDate); updatePayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); - //updatePayOrder.setTradeNo(tradeNo); + updatePayOrder.setTransactionId(transactionId); wxPayOrderMapper.updateByPrimaryKeySelective(updatePayOrder); Map msgMap = new HashMap<>(); @@ -199,6 +199,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { msgMap.put("orderNo", String.valueOf(order.getId())); msgMap.put("createTime", Utility.getDataFormatString3(order.getCreateDate())); msgMap.put("standingTime", order.getCreateDate() + "-" + currentDate ); + // 短信 通知 商户 //smsSenderHandler.sendSms("SMS_18195394", order.getMobile(), msgMap); } catch (Exception e) { logger.error("pay success handle, sms send exception, payOrderi: " + updatePayOrder+ ", msgMap: " + msgMap.toString() + ", e: " + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 6901803d5..60de75590 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -12,6 +12,7 @@ + @@ -19,7 +20,7 @@ - `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`pay_amount`,`pay_time_start`,`pay_time_end`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason` + `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason` @@ -53,12 +54,12 @@ and `c_user_id` = #{cUserId} - - - - and `ip` = #{ip} - - + + + + and `ip` like concat('%', #{ip},'%') + + and `pay_amount` = #{payAmount} @@ -75,6 +76,11 @@ + + and `transaction_id` like concat('%', #{transactionId},'%') + + + and `pay_vendor` = #{payVendor} From 2953abbadce3dec52243ad5a02b2d87e8b1509bd Mon Sep 17 00:00:00 2001 From: masterspirit Date: Fri, 10 Aug 2018 18:57:21 +0800 Subject: [PATCH 09/27] =?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 10/27] =?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 11/27] =?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 12/27] =?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 13/27] =?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 14/27] =?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 15/27] =?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 16/27] =?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 17/27] =?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 18/27] 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: From a096e3b009f0adf55a6415b18de721b7b8e6b1cf Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 07:29:21 +0800 Subject: [PATCH 19/27] =?UTF-8?q?B=E7=AB=AF=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkBApi/pom.xml | 33 +++ .../main/java/com/simple/UserApplication.java | 0 .../com/simple/controller/BaseController.java | 70 +++---- .../controller/WxAppinfoController.java | 0 .../simple/controller/WxBLogController.java | 0 .../controller/WxBannersController.java | 0 .../controller/WxBusinessController.java | 0 .../simple/controller/WxCLogController.java | 0 .../controller/WxCUserCarsController.java | 0 .../simple/controller/WxCUserController.java | 0 .../controller/WxCUserTagsController.java | 0 .../controller/WxCarCmdLogsController.java | 0 .../WxCouponActionLogController.java | 0 .../controller/WxCouponCarController.java | 0 .../controller/WxCouponChannelController.java | 0 .../simple/controller/WxCouponController.java | 0 .../controller/WxCouponSendController.java | 0 .../controller/WxCouponTypeController.java | 0 .../controller/WxCouponVerifyController.java | 0 .../controller/WxMallBuildingController.java | 0 .../simple/controller/WxMallController.java | 0 .../controller/WxMallFloorController.java | 0 .../controller/WxMerchantBUserController.java | 0 .../controller/WxMerchantController.java | 0 .../controller/WxMerchantShopController.java | 0 .../WxMerchantTradeDailyController.java | 0 .../controller/WxMsgCallbackController.java | 0 .../controller/WxMsgConfigController.java | 0 .../simple/controller/WxMsgController.java | 0 .../controller/WxMsgModelController.java | 0 .../controller/WxMsgSignatureController.java | 0 .../simple/controller/WxOrderController.java | 0 .../simple/controller/WxParkController.java | 0 .../controller/WxPayOrderController.java | 0 .../controller/WxScoreHistoryController.java | 0 .../controller/WxScoreRulesController.java | 0 .../WxScoreValidityPeriodController.java | 0 .../simple/controller/WxShopController.java | 0 .../simple/controller/WxTagsController.java | 0 .../simple/controller/WxWebLogController.java | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application.yml | 39 ++++ .../src/main/resources/logback.xml | 188 +++++++++--------- {mallinkCclientApi => mallinkCApi}/pom.xml | 0 .../main/java/com/simple/UserApplication.java | 21 ++ .../com/simple/controller/BaseController.java | 35 ++++ .../controller/WxAppinfoController.java | 71 +++++++ .../simple/controller/WxBLogController.java | 71 +++++++ .../controller/WxBannersController.java | 71 +++++++ .../controller/WxBusinessController.java | 71 +++++++ .../simple/controller/WxCLogController.java | 71 +++++++ .../controller/WxCUserCarsController.java | 71 +++++++ .../simple/controller/WxCUserController.java | 71 +++++++ .../controller/WxCUserTagsController.java | 71 +++++++ .../controller/WxCarCmdLogsController.java | 71 +++++++ .../WxCouponActionLogController.java | 71 +++++++ .../controller/WxCouponCarController.java | 71 +++++++ .../controller/WxCouponChannelController.java | 71 +++++++ .../simple/controller/WxCouponController.java | 71 +++++++ .../controller/WxCouponSendController.java | 71 +++++++ .../controller/WxCouponTypeController.java | 71 +++++++ .../controller/WxCouponVerifyController.java | 71 +++++++ .../controller/WxMallBuildingController.java | 71 +++++++ .../simple/controller/WxMallController.java | 71 +++++++ .../controller/WxMallFloorController.java | 71 +++++++ .../controller/WxMerchantBUserController.java | 71 +++++++ .../controller/WxMerchantController.java | 71 +++++++ .../controller/WxMerchantShopController.java | 71 +++++++ .../WxMerchantTradeDailyController.java | 71 +++++++ .../controller/WxMsgCallbackController.java | 71 +++++++ .../controller/WxMsgConfigController.java | 71 +++++++ .../simple/controller/WxMsgController.java | 71 +++++++ .../controller/WxMsgModelController.java | 71 +++++++ .../controller/WxMsgSignatureController.java | 71 +++++++ .../simple/controller/WxOrderController.java | 126 ++++++++++++ .../simple/controller/WxParkController.java | 71 +++++++ .../controller/WxPayOrderController.java | 150 ++++++++++++++ .../controller/WxScoreHistoryController.java | 71 +++++++ .../controller/WxScoreRulesController.java | 71 +++++++ .../WxScoreValidityPeriodController.java | 71 +++++++ .../simple/controller/WxShopController.java | 71 +++++++ .../simple/controller/WxTagsController.java | 71 +++++++ .../simple/controller/WxWebLogController.java | 71 +++++++ .../src/main/resources/application-dev.yml | 40 ++++ .../src/main/resources/application-prod.yml | 36 ++++ .../src/main/resources/application.yml | 0 mallinkCApi/src/main/resources/logback.xml | 95 +++++++++ pom.xml | 3 +- 89 files changed, 3191 insertions(+), 130 deletions(-) create mode 100644 mallinkBApi/pom.xml rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/UserApplication.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/BaseController.java (97%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxAppinfoController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxBLogController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxBannersController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxBusinessController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCLogController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCUserCarsController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCUserController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCUserTagsController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCarCmdLogsController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponActionLogController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponCarController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponChannelController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponSendController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponTypeController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxCouponVerifyController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMallBuildingController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMallController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMallFloorController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMerchantBUserController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMerchantController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMerchantShopController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMsgCallbackController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMsgConfigController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMsgController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMsgModelController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxMsgSignatureController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxOrderController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxParkController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxPayOrderController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxScoreHistoryController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxScoreRulesController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxShopController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxTagsController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/java/com/simple/controller/WxWebLogController.java (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/resources/application-dev.yml (100%) rename {mallinkCclientApi => mallinkBApi}/src/main/resources/application-prod.yml (100%) create mode 100644 mallinkBApi/src/main/resources/application.yml rename {mallinkCclientApi => mallinkBApi}/src/main/resources/logback.xml (97%) rename {mallinkCclientApi => mallinkCApi}/pom.xml (100%) create mode 100644 mallinkCApi/src/main/java/com/simple/UserApplication.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/BaseController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMallController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxParkController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxShopController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java create mode 100644 mallinkCApi/src/main/resources/application-dev.yml create mode 100644 mallinkCApi/src/main/resources/application-prod.yml rename {mallinkCclientApi => mallinkCApi}/src/main/resources/application.yml (100%) create mode 100644 mallinkCApi/src/main/resources/logback.xml diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml new file mode 100644 index 000000000..4b4449c02 --- /dev/null +++ b/mallinkBApi/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + mallink + com.simple + 1.0 + + + mallinkBApi + + + + com.simple + mallinkService + 1.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/mallinkCclientApi/src/main/java/com/simple/UserApplication.java b/mallinkBApi/src/main/java/com/simple/UserApplication.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/UserApplication.java rename to mallinkBApi/src/main/java/com/simple/UserApplication.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java similarity index 97% rename from mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java rename to mallinkBApi/src/main/java/com/simple/controller/BaseController.java index 73d9c5cbb..7f8b36a46 100644 --- a/mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java @@ -1,35 +1,35 @@ -package com.simple.controller; - -import java.beans.PropertyEditorSupport; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class BaseController { - @InitBinder - public void InitBinder(WebDataBinder dataBinder) { - dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { - public void setAsText(String value) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); - } catch(ParseException e) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); - } catch (ParseException e1) { - setValue(null); - } - } - } - - public String getAsText() { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); - } - - }); - } -} +package com.simple.controller; + +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class BaseController { + @InitBinder + public void InitBinder(WebDataBinder dataBinder) { + dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + public void setAsText(String value) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); + } catch(ParseException e) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); + } catch (ParseException e1) { + setValue(null); + } + } + } + + public String getAsText() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); + } + + }); + } +} diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkBApi/src/main/java/com/simple/controller/WxAppinfoController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxAppinfoController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserCarsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserCarsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkBApi/src/main/java/com/simple/controller/WxParkController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxParkController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxShopController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxShopController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java diff --git a/mallinkCclientApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application-dev.yml rename to mallinkBApi/src/main/resources/application-dev.yml diff --git a/mallinkCclientApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application-prod.yml rename to mallinkBApi/src/main/resources/application-prod.yml diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml new file mode 100644 index 000000000..4f5159bdd --- /dev/null +++ b/mallinkBApi/src/main/resources/application.yml @@ -0,0 +1,39 @@ +server: + port: 8000 + context-path: /B + +spring: + application: + name: mallink + profiles: + active: dev + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + + +# @{link} https://github.com/abel533 +#Mybatis +mybatis: + type-aliases-package: com.simple.domain.po + mapper-locations: classpath:mapper/*Mapper.xml + configuration: + map-underscore-to-camel-case: true + cache-enabled: true + lazy-loading-enabled: true + use-generated-keys: true + default-fetch-size: 100 + +#PageHelper +pagehelper: + helperDialect: mysql + reasonable: false + supportMethodsArguments: true + params: count=countSql + offset-as-page-num: true + page-size-zero: true + row-bounds-with-count: true + +mapper: + mappers: + - com.simple.common.CommonMapper diff --git a/mallinkCclientApi/src/main/resources/logback.xml b/mallinkBApi/src/main/resources/logback.xml similarity index 97% rename from mallinkCclientApi/src/main/resources/logback.xml rename to mallinkBApi/src/main/resources/logback.xml index 41e865f70..155df638e 100644 --- a/mallinkCclientApi/src/main/resources/logback.xml +++ b/mallinkBApi/src/main/resources/logback.xml @@ -1,95 +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 - - - - - - - - - - - - - + + + + + + + + [%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 diff --git a/mallinkCclientApi/pom.xml b/mallinkCApi/pom.xml similarity index 100% rename from mallinkCclientApi/pom.xml rename to mallinkCApi/pom.xml diff --git a/mallinkCApi/src/main/java/com/simple/UserApplication.java b/mallinkCApi/src/main/java/com/simple/UserApplication.java new file mode 100644 index 000000000..a16a60136 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/UserApplication.java @@ -0,0 +1,21 @@ +package com.simple; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author chenkx + * @date 2017-12-26 + */ +@SpringBootApplication +@MapperScan(basePackages = {"com.simple.mapper"}) +@EnableSwagger2 +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/BaseController.java b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java new file mode 100644 index 000000000..7f8b36a46 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java @@ -0,0 +1,35 @@ +package com.simple.controller; + +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class BaseController { + @InitBinder + public void InitBinder(WebDataBinder dataBinder) { + dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + public void setAsText(String value) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); + } catch(ParseException e) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); + } catch (ParseException e1) { + setValue(null); + } + } + } + + public String getAsText() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); + } + + }); + } +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java new file mode 100644 index 000000000..d228e669b --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxAppinfo") +public class WxAppinfoController extends BaseController +{ + @Autowired + private WxAppinfoService wxAppinfoService; + + private Logger logger = Logger.getLogger(WxAppinfoController.class); + + @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(); + final PageInfo page = wxAppinfoService.listAsPage(wxAppinfo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxAppinfo wxAppinfo) { + //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxAppinfoService.saveOrUpdate(wxAppinfo); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxAppinfo wxAppinfo) { + wxAppinfoService.saveOrUpdate(wxAppinfo); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxAppinfoService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java new file mode 100644 index 000000000..f438992e0 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxBLog") +public class WxBLogController extends BaseController +{ + @Autowired + private WxBLogService wxBLogService; + + private Logger logger = Logger.getLogger(WxBLogController.class); + + @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(); + final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBLog wxBLog) { + //Assert.notNull(wxBLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBLogService.saveOrUpdate(wxBLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBLog wxBLog) { + wxBLogService.saveOrUpdate(wxBLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java new file mode 100644 index 000000000..e148e2402 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java @@ -0,0 +1,71 @@ +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.WxBanners; +import com.simple.service.WxBannersService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxBanners") +public class WxBannersController extends BaseController +{ + @Autowired + private WxBannersService wxBannersService; + + private Logger logger = Logger.getLogger(WxBannersController.class); + + @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 WxBanners wxBanners,Integer pageNum, Integer pageSize) { + if (null == wxBanners) wxBanners = new WxBanners(); + final PageInfo page = wxBannersService.listAsPage(wxBanners, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBanners wxBanners) { + //Assert.notNull(wxBanners.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBannersService.saveOrUpdate(wxBanners); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBanners wxBanners) { + wxBannersService.saveOrUpdate(wxBanners); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxBannersService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxBannersService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java new file mode 100644 index 000000000..3f0d53b90 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxBusiness") +public class WxBusinessController extends BaseController +{ + @Autowired + private WxBusinessService wxBusinessService; + + private Logger logger = Logger.getLogger(WxBusinessController.class); + + @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(); + final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBusiness wxBusiness) { + //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBusinessService.saveOrUpdate(wxBusiness); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBusiness wxBusiness) { + wxBusinessService.saveOrUpdate(wxBusiness); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java new file mode 100644 index 000000000..934c12628 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java @@ -0,0 +1,71 @@ +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.WxCLog; +import com.simple.service.WxCLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCLog") +public class WxCLogController extends BaseController +{ + @Autowired + private WxCLogService wxCLogService; + + private Logger logger = Logger.getLogger(WxCLogController.class); + + @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 WxCLog wxCLog,Integer pageNum, Integer pageSize) { + if (null == wxCLog) wxCLog = new WxCLog(); + final PageInfo page = wxCLogService.listAsPage(wxCLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCLog wxCLog) { + //Assert.notNull(wxCLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCLogService.saveOrUpdate(wxCLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCLog wxCLog) { + wxCLogService.saveOrUpdate(wxCLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxCLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java new file mode 100644 index 000000000..8b9374f21 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java @@ -0,0 +1,71 @@ +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.WxCUserCars; +import com.simple.service.WxCUserCarsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCUserCars") +public class WxCUserCarsController extends BaseController +{ + @Autowired + private WxCUserCarsService wxCUserCarsService; + + private Logger logger = Logger.getLogger(WxCUserCarsController.class); + + @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 WxCUserCars wxCUserCars,Integer pageNum, Integer pageSize) { + if (null == wxCUserCars) wxCUserCars = new WxCUserCars(); + final PageInfo page = wxCUserCarsService.listAsPage(wxCUserCars, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUserCars wxCUserCars) { + //Assert.notNull(wxCUserCars.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserCarsService.saveOrUpdate(wxCUserCars); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUserCars wxCUserCars) { + wxCUserCarsService.saveOrUpdate(wxCUserCars); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCUserCarsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxCUserCarsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java new file mode 100644 index 000000000..f93ce3c99 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java @@ -0,0 +1,71 @@ +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.WxCUser; +import com.simple.service.WxCUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCUser") +public class WxCUserController extends BaseController +{ + @Autowired + private WxCUserService wxCUserService; + + private Logger logger = Logger.getLogger(WxCUserController.class); + + @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 WxCUser wxCUser,Integer pageNum, Integer pageSize) { + if (null == wxCUser) wxCUser = new WxCUser(); + final PageInfo page = wxCUserService.listAsPage(wxCUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUser wxCUser) { + //Assert.notNull(wxCUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserService.saveOrUpdate(wxCUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUser wxCUser) { + wxCUserService.saveOrUpdate(wxCUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCUserService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxCUserService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java new file mode 100644 index 000000000..8dc774b51 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxCUserTags") +public class WxCUserTagsController extends BaseController +{ + @Autowired + private WxCUserTagsService wxCUserTagsService; + + private Logger logger = Logger.getLogger(WxCUserTagsController.class); + + @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(); + final PageInfo page = wxCUserTagsService.listAsPage(wxCUserTags, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUserTags wxCUserTags) { + //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserTagsService.saveOrUpdate(wxCUserTags); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUserTags wxCUserTags) { + wxCUserTagsService.saveOrUpdate(wxCUserTags); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java new file mode 100644 index 000000000..3eb4a4141 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java @@ -0,0 +1,71 @@ +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.WxCarCmdLogs; +import com.simple.service.WxCarCmdLogsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCarCmdLogs") +public class WxCarCmdLogsController extends BaseController +{ + @Autowired + private WxCarCmdLogsService wxCarCmdLogsService; + + private Logger logger = Logger.getLogger(WxCarCmdLogsController.class); + + @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 WxCarCmdLogs wxCarCmdLogs,Integer pageNum, Integer pageSize) { + if (null == wxCarCmdLogs) wxCarCmdLogs = new WxCarCmdLogs(); + final PageInfo page = wxCarCmdLogsService.listAsPage(wxCarCmdLogs, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCarCmdLogsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxCarCmdLogsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java new file mode 100644 index 000000000..8b0605cc3 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxCouponActionLog") +public class WxCouponActionLogController extends BaseController +{ + @Autowired + private WxCouponActionLogService wxCouponActionLogService; + + private Logger logger = Logger.getLogger(WxCouponActionLogController.class); + + @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(); + final PageInfo page = wxCouponActionLogService.listAsPage(wxCouponActionLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { + //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponActionLog wxCouponActionLog) { + wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java new file mode 100644 index 000000000..6da6ef31d --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxCouponCar") +public class WxCouponCarController extends BaseController +{ + @Autowired + private WxCouponCarService wxCouponCarService; + + private Logger logger = Logger.getLogger(WxCouponCarController.class); + + @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(); + final PageInfo page = wxCouponCarService.listAsPage(wxCouponCar, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponCar wxCouponCar) { + //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponCarService.saveOrUpdate(wxCouponCar); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponCar wxCouponCar) { + wxCouponCarService.saveOrUpdate(wxCouponCar); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java new file mode 100644 index 000000000..f86461c8b --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -0,0 +1,71 @@ +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.WxCouponChannel; +import com.simple.service.WxCouponChannelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponChannel") +public class WxCouponChannelController extends BaseController +{ + @Autowired + private WxCouponChannelService wxCouponChannelService; + + private Logger logger = Logger.getLogger(WxCouponChannelController.class); + + @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(); + final PageInfo page = wxCouponChannelService.listAsPage(wxCouponChannel, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponChannel wxCouponChannel) { + //Assert.notNull(wxCouponChannel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponChannelService.saveOrUpdate(wxCouponChannel); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { + wxCouponChannelService.saveOrUpdate(wxCouponChannel); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java new file mode 100644 index 000000000..dd39b05b8 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -0,0 +1,71 @@ +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.WxCoupon; +import com.simple.service.WxCouponService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCoupon") +public class WxCouponController extends BaseController +{ + @Autowired + private WxCouponService wxCouponService; + + private Logger logger = Logger.getLogger(WxCouponController.class); + + @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) { + if (null == wxCoupon) wxCoupon = new WxCoupon(); + final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCoupon wxCoupon) { + //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCoupon wxCoupon) { + wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java new file mode 100644 index 000000000..b43a78ab1 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java @@ -0,0 +1,71 @@ +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.WxCouponSend; +import com.simple.service.WxCouponSendService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponSend") +public class WxCouponSendController extends BaseController +{ + @Autowired + private WxCouponSendService wxCouponSendService; + + private Logger logger = Logger.getLogger(WxCouponSendController.class); + + @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(); + final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponSend wxCouponSend) { + //Assert.notNull(wxCouponSend.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponSend wxCouponSend) { + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponSendService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java new file mode 100644 index 000000000..e61f27b76 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -0,0 +1,71 @@ +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.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponType") +public class WxCouponTypeController extends BaseController +{ + @Autowired + private WxCouponTypeService wxCouponTypeService; + + private Logger logger = Logger.getLogger(WxCouponTypeController.class); + + @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(); + final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponType wxCouponType) { + //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponTypeService.saveOrUpdate(wxCouponType); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponType wxCouponType) { + wxCouponTypeService.saveOrUpdate(wxCouponType); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java new file mode 100644 index 000000000..95b91de39 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java @@ -0,0 +1,71 @@ +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.WxCouponVerify; +import com.simple.service.WxCouponVerifyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponVerify") +public class WxCouponVerifyController extends BaseController +{ + @Autowired + private WxCouponVerifyService wxCouponVerifyService; + + private Logger logger = Logger.getLogger(WxCouponVerifyController.class); + + @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 WxCouponVerify wxCouponVerify,Integer pageNum, Integer pageSize) { + if (null == wxCouponVerify) wxCouponVerify = new WxCouponVerify(); + final PageInfo page = wxCouponVerifyService.listAsPage(wxCouponVerify, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponVerify wxCouponVerify) { + //Assert.notNull(wxCouponVerify.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponVerifyService.saveOrUpdate(wxCouponVerify); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponVerify wxCouponVerify) { + wxCouponVerifyService.saveOrUpdate(wxCouponVerify); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponVerifyService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxCouponVerifyService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java new file mode 100644 index 000000000..170a712bb --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -0,0 +1,71 @@ +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.WxMallBuilding; +import com.simple.service.WxMallBuildingService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMallBuilding") +public class WxMallBuildingController extends BaseController +{ + @Autowired + private WxMallBuildingService wxMallBuildingService; + + private Logger logger = Logger.getLogger(WxMallBuildingController.class); + + @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 WxMallBuilding wxMallBuilding,Integer pageNum, Integer pageSize) { + if (null == wxMallBuilding) wxMallBuilding = new WxMallBuilding(); + final PageInfo page = wxMallBuildingService.listAsPage(wxMallBuilding, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMallBuilding wxMallBuilding) { + //Assert.notNull(wxMallBuilding.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallBuildingService.saveOrUpdate(wxMallBuilding); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMallBuilding wxMallBuilding) { + wxMallBuildingService.saveOrUpdate(wxMallBuilding); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallBuildingService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxMallBuildingService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java new file mode 100644 index 000000000..def24e2a4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java @@ -0,0 +1,71 @@ +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.WxMall; +import com.simple.service.WxMallService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMall") +public class WxMallController extends BaseController +{ + @Autowired + private WxMallService wxMallService; + + private Logger logger = Logger.getLogger(WxMallController.class); + + @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 WxMall wxMall,Integer pageNum, Integer pageSize) { + if (null == wxMall) wxMall = new WxMall(); + final PageInfo page = wxMallService.listAsPage(wxMall, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMall wxMall) { + //Assert.notNull(wxMall.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallService.saveOrUpdate(wxMall); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMall wxMall) { + wxMallService.saveOrUpdate(wxMall); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxMallService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java new file mode 100644 index 000000000..23e580207 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java @@ -0,0 +1,71 @@ +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.WxMallFloor; +import com.simple.service.WxMallFloorService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMallFloor") +public class WxMallFloorController extends BaseController +{ + @Autowired + private WxMallFloorService wxMallFloorService; + + private Logger logger = Logger.getLogger(WxMallFloorController.class); + + @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 WxMallFloor wxMallFloor,Integer pageNum, Integer pageSize) { + if (null == wxMallFloor) wxMallFloor = new WxMallFloor(); + final PageInfo page = wxMallFloorService.listAsPage(wxMallFloor, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMallFloor wxMallFloor) { + //Assert.notNull(wxMallFloor.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallFloorService.saveOrUpdate(wxMallFloor); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMallFloor wxMallFloor) { + wxMallFloorService.saveOrUpdate(wxMallFloor); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallFloorService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxMallFloorService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java new file mode 100644 index 000000000..5b7ec6a03 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -0,0 +1,71 @@ +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.WxMerchantBUser; +import com.simple.service.WxMerchantBUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantBUser") +public class WxMerchantBUserController extends BaseController +{ + @Autowired + private WxMerchantBUserService wxMerchantBUserService; + + private Logger logger = Logger.getLogger(WxMerchantBUserController.class); + + @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 WxMerchantBUser wxMerchantBUser,Integer pageNum, Integer pageSize) { + if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); + final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantBUser wxMerchantBUser) { + //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantBUserService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxMerchantBUserService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java new file mode 100644 index 000000000..91e177f88 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java @@ -0,0 +1,71 @@ +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.WxMerchant; +import com.simple.service.WxMerchantService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchant") +public class WxMerchantController extends BaseController +{ + @Autowired + private WxMerchantService wxMerchantService; + + private Logger logger = Logger.getLogger(WxMerchantController.class); + + @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 WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { + if (null == wxMerchant) wxMerchant = new WxMerchant(); + final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchant wxMerchant) { + //Assert.notNull(wxMerchant.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantService.saveOrUpdate(wxMerchant); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchant wxMerchant) { + wxMerchantService.saveOrUpdate(wxMerchant); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxMerchantService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java new file mode 100644 index 000000000..f0c78f729 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -0,0 +1,71 @@ +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.WxMerchantShop; +import com.simple.service.WxMerchantShopService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantShop") +public class WxMerchantShopController extends BaseController +{ + @Autowired + private WxMerchantShopService wxMerchantShopService; + + private Logger logger = Logger.getLogger(WxMerchantShopController.class); + + @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(); + final PageInfo page = wxMerchantShopService.listAsPage(wxMerchantShop, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { + //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantShopService.saveOrUpdate(wxMerchantShop); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantShop wxMerchantShop) { + wxMerchantShopService.saveOrUpdate(wxMerchantShop); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java new file mode 100644 index 000000000..eccfc627a --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxMerchantTradeDaily") +public class WxMerchantTradeDailyController extends BaseController +{ + @Autowired + private WxMerchantTradeDailyService wxMerchantTradeDailyService; + + private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); + + @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(); + final PageInfo page = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { + //Assert.notNull(wxMerchantTradeDaily.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { + wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDailyService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java new file mode 100644 index 000000000..fe83b1398 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -0,0 +1,71 @@ +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.WxMsgCallback; +import com.simple.service.WxMsgCallbackService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgCallback") +public class WxMsgCallbackController extends BaseController +{ + @Autowired + private WxMsgCallbackService wxMsgCallbackService; + + private Logger logger = Logger.getLogger(WxMsgCallbackController.class); + + @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(); + final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { + //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgCallbackService.saveOrUpdate(wxMsgCallback); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgCallback wxMsgCallback) { + wxMsgCallbackService.saveOrUpdate(wxMsgCallback); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgCallbackService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java new file mode 100644 index 000000000..7ec2199c4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxMsgConfig") +public class WxMsgConfigController extends BaseController +{ + @Autowired + private WxMsgConfigService wxMsgConfigService; + + private Logger logger = Logger.getLogger(WxMsgConfigController.class); + + @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(); + final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { + //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java new file mode 100644 index 000000000..e97b4a3c6 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java @@ -0,0 +1,71 @@ +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.WxMsg; +import com.simple.service.WxMsgService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsg") +public class WxMsgController extends BaseController +{ + @Autowired + private WxMsgService wxMsgService; + + private Logger logger = Logger.getLogger(WxMsgController.class); + + @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(); + final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsg wxMsg) { + //Assert.notNull(wxMsg.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgService.saveOrUpdate(wxMsg); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsg wxMsg) { + wxMsgService.saveOrUpdate(wxMsg); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java new file mode 100644 index 000000000..38a746c01 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java @@ -0,0 +1,71 @@ +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.WxMsgModel; +import com.simple.service.WxMsgModelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgModel") +public class WxMsgModelController extends BaseController +{ + @Autowired + private WxMsgModelService wxMsgModelService; + + private Logger logger = Logger.getLogger(WxMsgModelController.class); + + @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(); + final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgModel wxMsgModel) { + //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgModel wxMsgModel) { + wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java new file mode 100644 index 000000000..e1bc56cce --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -0,0 +1,71 @@ +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.WxMsgSignature; +import com.simple.service.WxMsgSignatureService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgSignature") +public class WxMsgSignatureController extends BaseController +{ + @Autowired + private WxMsgSignatureService wxMsgSignatureService; + + private Logger logger = Logger.getLogger(WxMsgSignatureController.class); + + @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(); + final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { + //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgSignatureService.saveOrUpdate(wxMsgSignature); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) { + wxMsgSignatureService.saveOrUpdate(wxMsgSignature); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java new file mode 100644 index 000000000..4c2653cf8 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -0,0 +1,126 @@ +package com.simple.controller; + +import com.simple.enums.EnumOrderStatus; +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.WxOrder; +import com.simple.service.WxOrderService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxOrder") +public class WxOrderController extends BaseController { + private Logger logger = Logger.getLogger(WxOrderController.class); + + @Autowired + private WxOrderService wxOrderService; + + @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 = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + if (null == wxOrder) wxOrder = new WxOrder(); + final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("提交订单") + @PostMapping("save") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "券ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "payment", value = "支付金额", required = true, dataType = "BigDecimal"), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData saveOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.saveOrder(wxOrder); + return new ResultData(); + } + + @ApiOperation("取消订单") + @PostMapping("cancel") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData cancelOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); + return new ResultData(); + } + + @ApiOperation("订单过期") + @PostMapping("expiring") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); + return new ResultData(); + } + + @ApiOperation("订单已过期") + @PostMapping("expired") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData expiredOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); + return new ResultData(); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrder.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.saveOrUpdate(wxOrder); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxOrder wxOrder) { + wxOrderService.saveOrUpdate(wxOrder); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData delete(Long id) { + wxOrderService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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, "查询成功", wxOrderService.getById(id)); + } + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java new file mode 100644 index 000000000..2f7309c99 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxPark") +public class WxParkController extends BaseController +{ + @Autowired + private WxParkService wxParkService; + + private Logger logger = Logger.getLogger(WxParkController.class); + + @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(); + final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxPark wxPark) { + //Assert.notNull(wxPark.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxParkService.saveOrUpdate(wxPark); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxPark wxPark) { + wxParkService.saveOrUpdate(wxPark); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java new file mode 100644 index 000000000..b0bbf862e --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java @@ -0,0 +1,150 @@ +package com.simple.controller; + +import com.simple.common.ErrorCode; +import com.simple.enums.EnumPayStatus; +import com.simple.enums.EnumPayWay; +import com.simple.exception.BizMessageException; +import com.simple.exception.MallinkException; +import com.simple.pay.WxPayment; +import com.simple.utils.IPUtil; +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 javax.servlet.http.HttpServletRequest; +import java.util.Map; + +@RestController +@RequestMapping("wxPayOrder") +public class WxPayOrderController extends BaseController { + + private Logger logger = Logger.getLogger(WxPayOrderController.class); + + @Autowired + private WxPayOrderService wxPayOrderService; + + @ApiOperation(value = "发起微信小程序支付订单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cUserId", value = "用户id", required = true, dataType = "Long"), + @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "payVendor", value = "支付发起渠道:0-微信小程序", defaultValue = "0",required = false, dataType = "Integer") + }) + @RequestMapping(value = "/create", method = RequestMethod.POST) + public ResultData _create(WxPayOrder record, HttpServletRequest request) throws Exception { + logger.info("payment wechat, order create, param : " + record.toString()); + try { + record.setIp(IPUtil.getIpAddr(request)); + return wxPayOrderService.createPayOrder(record, EnumPayWay.PAY_WAY_WECHAT); + } catch (MallinkException e) { + 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()); + } + return new ResultData(ErrorCode.PAYORDER_ERROR.getCode(), ErrorCode.PAYORDER_ERROR.getMessage()); + } + + /** + * + * @return 接收微信异步通知 + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "/notify", method = RequestMethod.POST) + public String __doNotify(HttpServletRequest request) throws Exception { + Map paramMap = null; + String response; + try { + String xml = IOUtils.toString(request.getInputStream()); + paramMap = WxPayment.xmlToMap(xml); + logger.info("payment wxpay, notify, param: " + paramMap.toString() ); + response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); + logger.info("payment wxpay, notify success, req : " + paramMap.toString() + ", resp: " + response.toString()); + return response; + } catch (BizMessageException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" + e.getLocalizedMessage()); + return e.getMessage(); + } catch (MallinkException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" +e.getLocalizedMessage()); + return e.getMessage(); + } catch (Exception e) { + logger.error("payment wxpay, order create error, req: " + paramMap.toString() + ", e: " + e.getMessage()); + return e.getMessage(); + } + } + + /** + * + * @return 同步回调(订单状态主动检查) + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "callback", method = {RequestMethod.GET, RequestMethod.POST}) + public String __doCallback(HttpServletRequest request) throws Exception { + + logger.info("payment wxpay, callback,request:" + request.toString()); + + return "\n" + + "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + "\n"; + } + + @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(); + final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxPayOrder wxPayOrder) { + //Assert.notNull(wxPayOrder.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxPayOrderService.saveOrUpdate(wxPayOrder); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxPayOrder wxPayOrder) { + wxPayOrderService.saveOrUpdate(wxPayOrder); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long 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 new file mode 100644 index 000000000..56794ac8a --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxScoreHistory") +public class WxScoreHistoryController extends BaseController +{ + @Autowired + private WxScoreHistoryService wxScoreHistoryService; + + private Logger logger = Logger.getLogger(WxScoreHistoryController.class); + + @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(); + final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { + //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreHistoryService.saveOrUpdate(wxScoreHistory); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreHistory wxScoreHistory) { + wxScoreHistoryService.saveOrUpdate(wxScoreHistory); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java new file mode 100644 index 000000000..21cb402b7 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -0,0 +1,71 @@ +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.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxScoreRules") +public class WxScoreRulesController extends BaseController +{ + @Autowired + private WxScoreRulesService wxScoreRulesService; + + private Logger logger = Logger.getLogger(WxScoreRulesController.class); + + @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(); + final PageInfo page = wxScoreRulesService.listAsPage(wxScoreRules, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreRules wxScoreRules) { + //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreRulesService.saveOrUpdate(wxScoreRules); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreRules wxScoreRules) { + wxScoreRulesService.saveOrUpdate(wxScoreRules); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java new file mode 100644 index 000000000..1271b55d5 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxScoreValidityPeriod") +public class WxScoreValidityPeriodController extends BaseController +{ + @Autowired + private WxScoreValidityPeriodService wxScoreValidityPeriodService; + + private Logger logger = Logger.getLogger(WxScoreValidityPeriodController.class); + + @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(); + final PageInfo page = wxScoreValidityPeriodService.listAsPage(wxScoreValidityPeriod, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java new file mode 100644 index 000000000..5685653d4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java @@ -0,0 +1,71 @@ +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.WxShop; +import com.simple.service.WxShopService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxShop") +public class WxShopController extends BaseController +{ + @Autowired + private WxShopService wxShopService; + + private Logger logger = Logger.getLogger(WxShopController.class); + + @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(); + final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxShop wxShop) { + //Assert.notNull(wxShop.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxShopService.saveOrUpdate(wxShop); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxShop wxShop) { + wxShopService.saveOrUpdate(wxShop); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java new file mode 100644 index 000000000..52929d3c4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java @@ -0,0 +1,71 @@ +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.WxTags; +import com.simple.service.WxTagsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxTags") +public class WxTagsController extends BaseController +{ + @Autowired + private WxTagsService wxTagsService; + + private Logger logger = Logger.getLogger(WxTagsController.class); + + @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 WxTags wxTags,Integer pageNum, Integer pageSize) { + if (null == wxTags) wxTags = new WxTags(); + final PageInfo page = wxTagsService.listAsPage(wxTags, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxTags wxTags) { + //Assert.notNull(wxTags.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxTagsService.saveOrUpdate(wxTags); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxTags wxTags) { + wxTagsService.saveOrUpdate(wxTags); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxTagsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxTagsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java new file mode 100644 index 000000000..a74b33363 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java @@ -0,0 +1,71 @@ +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.WxWebLog; +import com.simple.service.WxWebLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxWebLog") +public class WxWebLogController extends BaseController +{ + @Autowired + private WxWebLogService wxWebLogService; + + private Logger logger = Logger.getLogger(WxWebLogController.class); + + @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 WxWebLog wxWebLog,Integer pageNum, Integer pageSize) { + if (null == wxWebLog) wxWebLog = new WxWebLog(); + final PageInfo page = wxWebLogService.listAsPage(wxWebLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxWebLog wxWebLog) { + //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxWebLogService.saveOrUpdate(wxWebLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxWebLog wxWebLog) { + wxWebLogService.saveOrUpdate(wxWebLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxWebLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @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,"查询成功",wxWebLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml new file mode 100644 index 000000000..c40f720f9 --- /dev/null +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -0,0 +1,40 @@ +spring: + # JDBC + datasource: + 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 + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + #jackson: + #date-format: yyyy-MM-dd HH:mm:ss + + # REDIS + redis: + host: 202.165.179.86 + port: 6789 + password: JGtest123 + timeout: 0 + expire: 1800 #30分钟 + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + +logging: + level: + tk.mybatis: debug + com.simple.mapper: debug diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml new file mode 100644 index 000000000..79193a5e4 --- /dev/null +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -0,0 +1,36 @@ +spring: + # JDBC + datasource: + url: jdbc:mysql://127.0.0.1:3306/mallink?characterEncoding=UTF-8 + username: root + password: 1234qwer + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + filters: stat + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + # REDIS + redis: + host: 127.0.0.1 + port: 6379 + timeout: 0 + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 + +logging: + level: + tk.mybatis: error + com.simple.mapper: error \ No newline at end of file diff --git a/mallinkCclientApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application.yml rename to mallinkCApi/src/main/resources/application.yml diff --git a/mallinkCApi/src/main/resources/logback.xml b/mallinkCApi/src/main/resources/logback.xml new file mode 100644 index 000000000..155df638e --- /dev/null +++ b/mallinkCApi/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 diff --git a/pom.xml b/pom.xml index d6afbe7db..d7bbe663c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,8 @@ mallinkService mallinkAdmin - mallinkCclientApi + mallinkCApi + mallinkBApi From a775faa42ee8b95152046e08c8aeccfd2a549056 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 07:43:31 +0800 Subject: [PATCH 20/27] =?UTF-8?q?B=E7=AB=AF=E5=90=8E=E5=8F=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 88 +++---------------- .../com/simple/service/WxOrderService.java | 11 +++ .../service/impl/WxOrderServiceImpl.java | 6 +- 3 files changed, 29 insertions(+), 76 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index 4c2653cf8..d63ade549 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController -@RequestMapping("wxOrder") +@RequestMapping("/order") public class WxOrderController extends BaseController { private Logger logger = Logger.getLogger(WxOrderController.class); @@ -29,98 +29,36 @@ public class WxOrderController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "bUserId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") }) - public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxOrder wxOrder, Long bUserId, Integer pageNum, Integer pageSize) { if (null == wxOrder) wxOrder = new WxOrder(); - final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); + final PageInfo page = wxOrderService.blistAsPage(wxOrder, bUserId, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("提交订单") - @PostMapping("save") - @ApiImplicitParams({ - @ApiImplicitParam(name = "couponId", value = "券ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "payment", value = "支付金额", required = true, dataType = "BigDecimal"), - @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") - }) - public ResultData saveOrder(@RequestBody WxOrder wxOrder) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.saveOrder(wxOrder); - return new ResultData(); - } - - @ApiOperation("取消订单") - @PostMapping("cancel") + @ApiOperation("订单详情") + @PostMapping("expired") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long") }) - public ResultData cancelOrder(@RequestBody WxOrder wxOrder) { + public ResultData orderDetail(@RequestBody WxOrder wxOrder) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); return new ResultData(); } - @ApiOperation("订单过期") - @PostMapping("expiring") + @ApiOperation("手工退款") + @PostMapping("refund") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long") }) public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); - return new ResultData(); - } - - @ApiOperation("订单已过期") - @PostMapping("expired") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), - @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") - }) - public ResultData expiredOrder(@RequestBody WxOrder wxOrder) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); - return new ResultData(); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxOrder wxOrder) { - //Assert.notNull(wxOrder.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxOrderService.saveOrUpdate(wxOrder); + // 1. + //wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); return new ResultData(); } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxOrder wxOrder) { - wxOrderService.saveOrUpdate(wxOrder); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - wxOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @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, "查询成功", wxOrderService.getById(id)); - } - - } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index d1dba36b8..d331aadd1 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -17,6 +17,17 @@ public interface WxOrderService { */ PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize); + /** + * 根据实体查询分页列表 + * + * @param record + * @param merchantId + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize); + /** * 提交订单 * @param record 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 e516a5632..835575556 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -30,12 +30,16 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxOrderMapper wxOrderMapper; - @Override public PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); } + @Override + public PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxOrder saveOrder(WxOrder record) { From 4824047313742f011c3a2942d05977124afb3887 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 08:37:54 +0800 Subject: [PATCH 21/27] =?UTF-8?q?TJD=E8=BD=A6=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkCApi/pom.xml | 2 +- .../service/impl/WxUserCouponServiceImpl.java | 65 ------------------- .../resources/mapper/WxCUserCarsMapper.xml | 14 +++- .../main/resources/mapper/WxOrderMapper.xml | 6 +- 4 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java diff --git a/mallinkCApi/pom.xml b/mallinkCApi/pom.xml index 0e7f141ff..c52e4ab9e 100644 --- a/mallinkCApi/pom.xml +++ b/mallinkCApi/pom.xml @@ -9,7 +9,7 @@ 1.0 - mallinkCclientApi + mallinkCApi diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java deleted file mode 100644 index ff8c1172e..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.simple.service.impl; -import com.simple.domain.dto.WxUserCouponDto; -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 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 WxUserCouponDto getWxUserCoupon(WxOrder wxOrder, String title){ - WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); - 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; - } -} diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml index 04040d13c..31f261e49 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml @@ -8,10 +8,12 @@ + + - `id`,`tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date` + `id`,`tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date`,`vendor_type`,`vendor_params` @@ -45,6 +47,16 @@ and `update_date` = #{updateDate} + + + + and `vendor_type` = #{vendorType} + + + + + and `vendor_params` like concat('%', #{vendorParams},'%') + and id in diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index baaf5b3a0..08dc8cd4f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - `id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`payment_time`,`status`,`coupon_status`,`validDate`,`refund`,`refund_time`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`payment_time`,`status`,`coupon_status`,`valid_date`,`refund`,`refund_time`,`create_date`,`update_date` @@ -65,7 +65,7 @@ - and `validDate` = #{validDate} + and `valid_date` = #{validDate} From f479b8b996117f1619fef360d159fbff2655dcb0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 11:42:58 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 30 +++++--- .../java/com/simple/mapper/WxOrderMapper.java | 9 ++- .../com/simple/service/WxOrderService.java | 14 ++-- .../service/impl/WxOrderServiceImpl.java | 11 ++- .../main/resources/mapper/WxOrderMapper.xml | 68 ++++++++++++++++++- 5 files changed, 107 insertions(+), 25 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index d63ade549..2d488ec3d 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -16,6 +16,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.Map; + @RestController @RequestMapping("/order") public class WxOrderController extends BaseController { @@ -24,29 +26,37 @@ public class WxOrderController extends BaseController { @Autowired private WxOrderService wxOrderService; - @ApiOperation("分页列表接口") @GetMapping("list") + @ApiOperation(value = "券查询接口", notes="{\"pageNum\":int,\"pageSize\":int," + + "\"merchantId\":Long,\"cUserId\":Long,"+ + "\"status\":int,\"couponStatus\":int}") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "bUserId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), - @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData list(@ModelAttribute WxOrder wxOrder, Long bUserId, Integer pageNum, Integer pageSize) { - if (null == wxOrder) wxOrder = new WxOrder(); - final PageInfo page = wxOrderService.blistAsPage(wxOrder, bUserId, pageNum, pageSize); + public ResultData list(@RequestBody Map params) { + final PageInfo> page = wxOrderService.bQueryListMap(params); return new ResultData(page); } @ApiOperation("订单详情") - @PostMapping("expired") + @PostMapping("detail") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long") + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData orderDetail(@RequestBody WxOrder wxOrder) { + public ResultData orderDetail(@RequestBody Map params) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - return new ResultData(); + Map map = wxOrderService.queryObject(params); + return new ResultData(map); } @ApiOperation("手工退款") diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index c3aa5a5a2..9a8e6b320 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -8,10 +8,9 @@ import com.simple.domain.po.WxOrder; public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - - - - - + List> queryListMap(Map params); + + Map queryObject(Map params); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index d331aadd1..b369daae3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -20,13 +20,17 @@ public interface WxOrderService { /** * 根据实体查询分页列表 * - * @param record - * @param merchantId - * @param pageIndex - * @param pageSize + * @param params + * @return + */ + PageInfo> bQueryListMap(Map params); + + /** + * 查询券详情 + * @param params * @return */ - PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize); + Map queryObject(Map params); /** * 提交订单 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 835575556..9ec63109e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -36,8 +36,15 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public PageInfo blistAsPage(WxOrder record, Long merchantId, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); + public PageInfo> bQueryListMap(Map params) { + Integer pageIndex = (Integer) params.get("pageIndex"); + Integer pageSize = (Integer) params.get("pageSize"); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(params)); + } + + @Override + public Map queryObject(Map params) { + return wxOrderMapper.queryObject(params); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 08dc8cd4f..11d5da2e9 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -101,9 +101,71 @@ select from wx_order - - - + + + + + From aabc2600ee76c5bf44977b32e06d9706ca0fd15a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 12:36:47 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxChannelController.java | 71 +++++++++ .../simple/controller/WxCouponController.java | 4 +- .../java/com/simple/domain/po/WxChannel.java | 141 ++++++++++++++++++ .../com/simple/mapper/WxChannelMapper.java | 17 +++ .../com/simple/service/WxChannelService.java | 48 ++++++ .../service/impl/WxChannelServiceImpl.java | 54 +++++++ .../main/resources/mapper/WxChannelMapper.xml | 62 ++++++++ 7 files changed, 395 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java create mode 100644 mallinkService/src/main/java/com/simple/domain/po/WxChannel.java create mode 100644 mallinkService/src/main/java/com/simple/mapper/WxChannelMapper.java create mode 100644 mallinkService/src/main/java/com/simple/service/WxChannelService.java create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxChannelServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/WxChannelMapper.xml diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java new file mode 100644 index 000000000..a439cca3b --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxChannelController.java @@ -0,0 +1,71 @@ +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; + +@RestController +@RequestMapping("wxChannel") +public class WxChannelController extends BaseController +{ + @Autowired + private WxChannelService wxChannelService; + + private Logger logger = Logger.getLogger(WxChannelController.class); + + @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(); + final PageInfo page = wxChannelService.listAsPage(wxChannel, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxChannel wxChannel) { + //Assert.notNull(wxChannel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxChannelService.saveOrUpdate(wxChannel); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxChannel wxChannel) { + wxChannelService.saveOrUpdate(wxChannel); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @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) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxChannelService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index dd39b05b8..2b60eb267 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -19,10 +19,10 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("wxCoupon") public class WxCouponController extends BaseController { + private Logger logger = Logger.getLogger(WxCouponController.class); + @Autowired private WxCouponService wxCouponService; - - private Logger logger = Logger.getLogger(WxCouponController.class); @ApiOperation("分页列表接口") @GetMapping("list") diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java new file mode 100644 index 000000000..9c89beddc --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java @@ -0,0 +1,141 @@ +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 java.io.Serializable; + +@Table(name = "wx_channel") +public class WxChannel implements Serializable { + 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; + } + + + + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") + private Long tenantId; + /*渠道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; + public Long getTenantId() { + return tenantId; + } + public void setTenantId(Long _tenantId) { + tenantId = _tenantId; + } + 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 static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,ChannelId_ASC("`channelId` ASC"),ChannelId_DESC("`channelId` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,Img_ASC("`img` ASC"),Img_DESC("`img` 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()); + } + + } + + 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)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxChannelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxChannelMapper.java new file mode 100644 index 000000000..f525da3ba --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxChannelMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxChannel; + +public interface WxChannelMapper extends CommonMapper { + + List findList(WxChannel wxChannel); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxChannelService.java b/mallinkService/src/main/java/com/simple/service/WxChannelService.java new file mode 100644 index 000000000..dc380d564 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxChannelService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxChannel; + +public interface WxChannelService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxChannel record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxChannel getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxChannel record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxChannelServiceImpl.java new file mode 100644 index 000000000..77cf2646a --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxChannelServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxChannel; +import com.simple.mapper.WxChannelMapper; +import com.simple.service.WxChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxChannelServiceImpl implements WxChannelService { + + @Autowired + WxChannelMapper wxChannelMapper; + + + @Override + public PageInfo listAsPage(WxChannel record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxChannelMapper.findList(record)); + } + + @Override + public WxChannel getById(Long id) { + return wxChannelMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxChannel record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + wxChannelMapper.insertSelective(record); + } else { + wxChannelMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxChannelMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/resources/mapper/WxChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxChannelMapper.xml new file mode 100644 index 000000000..c3488c3d1 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxChannelMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + `id`,`tenant_id`,`channel_id`,`title`,`img` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` = #{tenantId} + + + + + and `channel_id` = #{channelId} + + + + + and `title` like concat('%', #{title},'%') + + + + + and `img` like concat('%', #{img},'%') + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + From daf1f07e5fac3781a3ca229d81deceb6a98fa41a Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 11 Aug 2018 14:11:47 +0800 Subject: [PATCH 24/27] CouponChannel --- .../controller/WxCouponChannelController.java | 7 ++ .../com/simple/domain/po/WxCouponChannel.java | 30 ++++++--- .../service/impl/WxUserCouponServiceImpl.java | 67 +++++++++++++++++++ .../mapper/WxCouponChannelMapper.xml | 8 ++- 4 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java index f86461c8b..61af1fedf 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -65,6 +65,13 @@ public class WxCouponChannelController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); } + + /*@ApiOperation("根据") + @GetMapping("/add") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); + }*/ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java index 702ace142..9841b8ed2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java @@ -1,12 +1,12 @@ 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.ArrayList; +import java.util.Date; +import java.util.List; @Table(name = "wx_coupon_channel") public class WxCouponChannel implements Serializable { @@ -50,14 +50,17 @@ public class WxCouponChannel implements Serializable { /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; + /*券状态,判断是否在前端展示**/ + @io.swagger.annotations.ApiModelProperty(value="券状态,判断是否在前端展示",name="couponStatus") + private Integer couponStatus; /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /*投放频道位置(1.banner图,2.限时抢购)**/ - @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") + /*投放频道位置(1.列表, 2.限时抢购)**/ + @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.列表, 2.限时抢购)",name="targetAd") private Integer targetAd; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @@ -83,6 +86,12 @@ public class WxCouponChannel implements Serializable { public void setCouponId(Long _couponId) { couponId = _couponId; } + public Integer getCouponStatus() { + return couponStatus; + } + public void setCouponStatus(Integer _couponStatus) { + couponStatus = _couponStatus; + } public Integer getType() { return type; } @@ -122,6 +131,7 @@ public class WxCouponChannel implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,CouponStatus_ASC("`couponStatus` ASC"),CouponStatus_DESC("`couponStatus` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") @@ -159,9 +169,9 @@ public class WxCouponChannel implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -169,7 +179,7 @@ public class WxCouponChannel implements Serializable { } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } 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..26fd32307 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java @@ -0,0 +1,67 @@ +package com.simple.service.impl; +import com.simple.domain.dto.WxUserCouponDto; +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 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 WxUserCouponDto getWxUserCoupon(WxOrder wxOrder, String title){ + WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); + 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; + } +} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index bef6d27ba..f2cc85a26 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -6,6 +6,7 @@ + @@ -14,7 +15,7 @@ - `id`,`tenant_id`,`merchant_id`,`coupon_id`,`type`,`title`,`target_ad`,`create_date`,`update_date` + `id`,`tenant_id`,`merchant_id`,`coupon_id`,`coupon_status`,`type`,`title`,`target_ad`,`create_date`,`update_date` @@ -40,6 +41,11 @@ + + and `coupon_status` = #{couponStatus} + + + and `type` = #{type} From 55ebd09d3c1ade1a96d1908671fae8aef57ab511 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 11 Aug 2018 15:17:55 +0800 Subject: [PATCH 25/27] =?UTF-8?q?B,C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8CB=E7=AB=AF=E8=AE=A2=E5=8D=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UserApplication.java => BApplication.java} | 4 +- .../simple/controller/WxOrderController.java | 20 ++--- ...UserApplication.java => CApplication.java} | 4 +- .../java/com/simple/domain/vo/OrderVo.java | 76 +++++++++++++++++++ .../java/com/simple/mapper/WxOrderMapper.java | 5 +- .../com/simple/service/WxOrderService.java | 11 ++- .../service/impl/WxOrderServiceImpl.java | 11 ++- .../main/resources/mapper/WxOrderMapper.xml | 24 ++++-- 8 files changed, 124 insertions(+), 31 deletions(-) rename mallinkBApi/src/main/java/com/simple/{UserApplication.java => BApplication.java} (83%) rename mallinkCApi/src/main/java/com/simple/{UserApplication.java => CApplication.java} (83%) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java diff --git a/mallinkBApi/src/main/java/com/simple/UserApplication.java b/mallinkBApi/src/main/java/com/simple/BApplication.java similarity index 83% rename from mallinkBApi/src/main/java/com/simple/UserApplication.java rename to mallinkBApi/src/main/java/com/simple/BApplication.java index a16a60136..0b399ffbd 100644 --- a/mallinkBApi/src/main/java/com/simple/UserApplication.java +++ b/mallinkBApi/src/main/java/com/simple/BApplication.java @@ -13,9 +13,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 -public class UserApplication { +public class BApplication { public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); + SpringApplication.run(BApplication.class, args); } } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java index 2d488ec3d..99cb4d533 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -27,35 +28,36 @@ public class WxOrderController extends BaseController { private WxOrderService wxOrderService; @GetMapping("list") - @ApiOperation(value = "券查询接口", notes="{\"pageNum\":int,\"pageSize\":int," + - "\"merchantId\":Long,\"cUserId\":Long,"+ - "\"status\":int,\"couponStatus\":int}") + @ApiOperation(value = "券查询接口", notes="") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = false), @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData list(@RequestBody Map params) { - final PageInfo> page = wxOrderService.bQueryListMap(params); + public ResultData list(@ModelAttribute OrderVo orderVo, Integer pageNum, Integer pageSize) { + final PageInfo> page = wxOrderService.bQueryListMap(orderVo, pageNum, pageSize); return new ResultData(page); } @ApiOperation("订单详情") - @PostMapping("detail") + @GetMapping("detail") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), @ApiImplicitParam(name = "merchantId", value = "B端用户ID", dataType = "Long", paramType = "query", required = true), @ApiImplicitParam(name = "cUserId", value = "C端用户ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "orderId", value = "订单ID", dataType = "Long", paramType = "query", required = false), + @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = false), @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") }) - public ResultData orderDetail(@RequestBody Map params) { + public ResultData orderDetail(@ModelAttribute OrderVo orderVo) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - Map map = wxOrderService.queryObject(params); + Map map = wxOrderService.queryObject(orderVo); return new ResultData(map); } diff --git a/mallinkCApi/src/main/java/com/simple/UserApplication.java b/mallinkCApi/src/main/java/com/simple/CApplication.java similarity index 83% rename from mallinkCApi/src/main/java/com/simple/UserApplication.java rename to mallinkCApi/src/main/java/com/simple/CApplication.java index a16a60136..6e64298dd 100644 --- a/mallinkCApi/src/main/java/com/simple/UserApplication.java +++ b/mallinkCApi/src/main/java/com/simple/CApplication.java @@ -13,9 +13,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @MapperScan(basePackages = {"com.simple.mapper"}) @EnableSwagger2 -public class UserApplication { +public class CApplication { public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); + SpringApplication.run(CApplication.class, args); } } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java new file mode 100644 index 000000000..72bf2ec2a --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java @@ -0,0 +1,76 @@ +package com.simple.domain.vo; + +import java.io.Serializable; + +public class OrderVo implements Serializable { + private static final long serialVersionUID = 1L; + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*订单ID**/ + @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") + private Long orderId; + /*卡券ID**/ + @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") + private Long couponId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*c端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") + private Long cUserId; + /*订单状态**/ + @io.swagger.annotations.ApiModelProperty(value="订单状态",name="status") + private Integer status; + /*券状态**/ + @io.swagger.annotations.ApiModelProperty(value="券状态",name="status") + private Integer couponStatus; + + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long _orderId) { + orderId = _orderId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getCouponStatus() { + return couponStatus; + } + + public void setCouponStatus(Integer couponStatus) { + this.couponStatus = couponStatus; + } +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index 9a8e6b320..063ac1807 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.OrderVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxOrder; @@ -9,8 +10,8 @@ public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - List> queryListMap(Map params); + List> queryListMap(OrderVo orderVo); - Map queryObject(Map params); + Map queryObject(OrderVo orderVo); } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index b369daae3..8611a7aac 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -3,6 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; public interface WxOrderService { @@ -20,17 +21,19 @@ public interface WxOrderService { /** * 根据实体查询分页列表 * - * @param params + * @param orderVo + * @param pageIndex + * @param pageSize * @return */ - PageInfo> bQueryListMap(Map params); + PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize); /** * 查询券详情 - * @param params + * @param orderVo * @return */ - Map queryObject(Map params); + Map queryObject(OrderVo orderVo); /** * 提交订单 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 9ec63109e..6141cbc7a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; import com.simple.exception.MallinkException; import com.simple.mapper.WxCouponMapper; @@ -36,15 +37,13 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public PageInfo> bQueryListMap(Map params) { - Integer pageIndex = (Integer) params.get("pageIndex"); - Integer pageSize = (Integer) params.get("pageSize"); - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(params)); + public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(orderVo)); } @Override - public Map queryObject(Map params) { - return wxOrderMapper.queryObject(params); + public Map queryObject(OrderVo orderVo) { + return wxOrderMapper.queryObject(orderVo); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 11d5da2e9..5aff7862a 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -103,7 +103,7 @@ - select o.id, o.coupon_id, c.title, v.verification_date, o.c_user_id, u.phone, u.nick_name, c.price, c.sale_price, o.status, o.coupon_status @@ -112,20 +112,26 @@ left join wx_coupon_verify v on v.coupon_id= o.coupon_id left join wx_c_user u on u.id = o.c_user_id + + and c.`tenant_id` = #{tenantId} + and c.`merchant_id` = #{merchantId} and o.`id` = #{orderId} + + and o.`coupon_id` = #{couponId} + and o.`c_user_id` = #{cUserId} - and o.status=#{status} + and o.`status` = #{status} - and o.coupon_status=#{couponStatus} + and o.`coupon_status` = #{couponStatus} @@ -135,7 +141,7 @@ - select o.id, o.coupon_id, c.title, c.sub_title, v.verification_date, o.c_user_id, o.create_date, u.phone, u.nick_name, c.price, c.sale_price, o.status, o.coupon_status, c.remark @@ -144,20 +150,26 @@ left join wx_coupon_verify v on v.coupon_id= o.coupon_id left join wx_c_user u on u.id = o.c_user_id + + and c.`tenant_id` = #{tenantId} + and c.`merchant_id` = #{merchantId} and o.`id` = #{orderId} + + and o.`coupon_id` = #{couponId} + and o.`c_user_id` = #{cUserId} - and o.status=#{status} + and o.`status` = #{status} - and o.coupon_status=#{couponStatus} + and o.`coupon_status` = #{couponStatus} From 2c9d24b5d8ac7611e35740a88a2381ebc8c8f58d Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 11 Aug 2018 16:17:28 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E6=8A=95=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/BaseController.java | 49 +++++++++++-------- .../controller/WxCouponChannelController.java | 23 ++++++--- .../simple/controller/WxCouponController.java | 8 +-- .../simple/domain/dto/WxCouponChannelDto.java | 37 ++++++++++++++ .../com/simple/domain/po/WxCouponChannel.java | 18 +++---- .../service/WxCouponChannelService.java | 2 + .../com/simple/service/WxCouponService.java | 2 +- .../impl/WxCouponChannelServiceImpl.java | 40 ++++++++++++--- .../service/impl/WxCouponServiceImpl.java | 3 +- 9 files changed, 131 insertions(+), 51 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/BaseController.java b/mallinkAdmin/src/main/java/com/simple/controller/BaseController.java index 73d9c5cbb..23c471015 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/BaseController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/BaseController.java @@ -5,31 +5,38 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import com.simple.domain.po.MallUserInfo; +import com.simple.shiro.UserSession; +import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; @RestController public class BaseController { - @InitBinder - public void InitBinder(WebDataBinder dataBinder) { - dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { - public void setAsText(String value) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); - } catch(ParseException e) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); - } catch (ParseException e1) { - setValue(null); - } - } - } - - public String getAsText() { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); - } - - }); - } + @InitBinder + public void InitBinder(WebDataBinder dataBinder) { + dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + public void setAsText(String value) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); + } catch(ParseException e) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); + } catch (ParseException e1) { + setValue(null); + } + } + } + + public String getAsText() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); + } + + }); + } + public MallUserInfo getUser(){ + MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + return user; + } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java index 61af1fedf..8fc0cb347 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -1,8 +1,9 @@ package com.simple.controller; +import com.simple.domain.dto.WxCouponChannelDto; +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; @@ -15,6 +16,9 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.ArrayList; +import java.util.List; + @RestController @RequestMapping("wxCouponChannel") public class WxCouponChannelController extends BaseController @@ -22,6 +26,7 @@ public class WxCouponChannelController extends BaseController @Autowired private WxCouponChannelService wxCouponChannelService; + private Logger logger = Logger.getLogger(WxCouponChannelController.class); @ApiOperation("分页列表接口") @@ -66,12 +71,16 @@ public class WxCouponChannelController extends BaseController return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); } - /*@ApiOperation("根据") - @GetMapping("/add") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); - }*/ + @ApiOperation("批量新增") + @PostMapping("/addbatch") + public ResultData findById(@RequestBody WxCouponChannelDto wxCouponChannelDto) { + String[] ids = wxCouponChannelDto.getCouponIds().split(","); + List list = new ArrayList<>(); + MallUserInfo user = getUser(); + wxCouponChannelService.addBatch(ids,wxCouponChannelDto.getChannelId(),user.getTenantId()); + return new ResultData(); + } + diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index f50e5f0e6..91a1c6082 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -60,8 +60,8 @@ public class WxCouponController extends BaseController String[] arys = wxCoupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } - wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(); + Long id = wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(id); } @ApiOperation("根据id更新接口") @@ -74,8 +74,8 @@ public class WxCouponController extends BaseController String[] arys = wxCoupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } - wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(); + Long id = wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(id); } @ApiOperation("根据id删除接口") diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java new file mode 100644 index 000000000..544dfc0a9 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java @@ -0,0 +1,37 @@ +package com.simple.domain.dto; + +import java.io.Serializable; + + +public class WxCouponChannelDto implements Serializable { + private static final long serialVersionUID = 1L; + private Long couponId; + private String couponIds; + private Integer channelId; + + + + public Integer getChannelId() { + return channelId; + } + + public void setChannelId(Integer channelId) { + this.channelId = channelId; + } + + public Long getCouponId() { + return couponId; + } + + public void setCouponId(Long couponId) { + this.couponId = couponId; + } + + public String getCouponIds() { + return couponIds; + } + + public void setCouponIds(String couponIds) { + this.couponIds = couponIds; + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java index 9841b8ed2..025127f50 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java @@ -1,12 +1,12 @@ package com.simple.domain.po; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.*; +import java.math.*; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_coupon_channel") public class WxCouponChannel implements Serializable { @@ -19,6 +19,7 @@ public class WxCouponChannel implements Serializable { protected List ids; @Transient protected String sortColumns; + public Long getId() { return id; @@ -124,7 +125,6 @@ public class WxCouponChannel implements Serializable { } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -154,7 +154,7 @@ public class WxCouponChannel implements Serializable { } } - public void setSortColumns(WxCouponChannel.Field... fields) + public void setSortColumns(Field... fields) { if (fields == null || fields.length == 0) { return; @@ -169,9 +169,9 @@ public class WxCouponChannel implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java index c1fb72bc9..115a719bf 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java @@ -37,6 +37,8 @@ public interface WxCouponChannelService { * @param id */ void deleteById(Long id); + + void addBatch(String[] ids,Integer channelId,String tanantId); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 1501835cc..13d90ca2b 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -29,7 +29,7 @@ public interface WxCouponService { * * @param record */ - void saveOrUpdate(WxCoupon record); + Long saveOrUpdate(WxCoupon record); /** * 根据Id删除实体 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 437d588f2..5b43e0ee5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -3,9 +3,11 @@ 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.WxCouponChannel; import com.simple.mapper.WxCouponChannelMapper; import com.simple.service.WxCouponChannelService; +import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; @@ -15,6 +17,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; + @Autowired + WxCouponService wxCouponService; @Override @@ -43,12 +47,32 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { public void deleteById(Long id) { wxCouponChannelMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public void addBatch(String[] ids,Integer channelId,String tanantId) { + for (String couponidstr:ids) { + Long couponid = Long.parseLong(couponidstr); + addCuponChannel(couponid,channelId,tanantId); + } + + } + + private void addCuponChannel(Long couponid,Integer channelId,String tanantId){ + + WxCoupon wxCouponUP = new WxCoupon(); + wxCouponUP.setId(couponid); + wxCouponUP.setStatus(1); + wxCouponService.saveOrUpdate(wxCouponUP); + + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setCouponId(couponid); + wxCouponChannel.setCouponStatus(1); + wxCouponChannel.setTargetAd(channelId); + wxCouponChannel.setTenantId(tanantId); + saveOrUpdate(wxCouponChannel); + + + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index 12d8b9caf..1a3deb569 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -28,7 +28,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public void saveOrUpdate(WxCoupon record) { + public Long saveOrUpdate(WxCoupon record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); @@ -37,6 +37,7 @@ public class WxCouponServiceImpl implements WxCouponService { } else { wxCouponMapper.updateByPrimaryKeySelective(record); } + return record.getId(); } @Override From d00bb905cf69626728796aa104aeb9a560836fd6 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 11 Aug 2018 16:58:13 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8A=95=E6=94=BE=E5=A4=9A=E4=B8=AA=E9=A2=91=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 3 ++- .../simple/domain/dto/WxCouponChannelDto.java | 6 +++--- .../service/WxCouponChannelService.java | 2 +- .../impl/WxCouponChannelServiceImpl.java | 21 +++++++++++-------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java index 8fc0cb347..2dcf012fe 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -75,9 +75,10 @@ public class WxCouponChannelController extends BaseController @PostMapping("/addbatch") public ResultData findById(@RequestBody WxCouponChannelDto wxCouponChannelDto) { String[] ids = wxCouponChannelDto.getCouponIds().split(","); + String[] channelId = wxCouponChannelDto.getChannelId().split(","); List list = new ArrayList<>(); MallUserInfo user = getUser(); - wxCouponChannelService.addBatch(ids,wxCouponChannelDto.getChannelId(),user.getTenantId()); + wxCouponChannelService.addBatch(ids,channelId,user.getTenantId()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java index 544dfc0a9..99d4452de 100644 --- a/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCouponChannelDto.java @@ -7,15 +7,15 @@ public class WxCouponChannelDto implements Serializable { private static final long serialVersionUID = 1L; private Long couponId; private String couponIds; - private Integer channelId; + private String channelId; - public Integer getChannelId() { + public String getChannelId() { return channelId; } - public void setChannelId(Integer channelId) { + public void setChannelId(String channelId) { this.channelId = channelId; } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java index 115a719bf..66db5d5ba 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java @@ -38,7 +38,7 @@ public interface WxCouponChannelService { */ void deleteById(Long id); - void addBatch(String[] ids,Integer channelId,String tanantId); + void addBatch(String[] ids,String[] channelId,String tanantId); 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 5b43e0ee5..3f7b22749 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -11,6 +11,7 @@ import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; +import org.springframework.transaction.annotation.Transactional; @Service public class WxCouponChannelServiceImpl implements WxCouponChannelService { @@ -49,29 +50,31 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } @Override - public void addBatch(String[] ids,Integer channelId,String tanantId) { - for (String couponidstr:ids) { - Long couponid = Long.parseLong(couponidstr); - addCuponChannel(couponid,channelId,tanantId); + @Transactional + public void addBatch(String[] ids,String[] channelId,String tanantId) { + + for (String targetIdstr:channelId) { + Integer targetId = Integer.parseInt(targetIdstr); + for (String couponidstr:ids) { + Long couponid = Long.parseLong(couponidstr); + addCuponChannel(couponid,targetId,tanantId); + } } - } - private void addCuponChannel(Long couponid,Integer channelId,String tanantId){ + } + public void addCuponChannel(Long couponid,Integer channelId,String tanantId){ WxCoupon wxCouponUP = new WxCoupon(); wxCouponUP.setId(couponid); wxCouponUP.setStatus(1); wxCouponService.saveOrUpdate(wxCouponUP); - WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setCouponId(couponid); wxCouponChannel.setCouponStatus(1); wxCouponChannel.setTargetAd(channelId); wxCouponChannel.setTenantId(tanantId); saveOrUpdate(wxCouponChannel); - - }