From 4fbe5a069840b31eec0bdd22b678175eb9c70f40 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 1 Jun 2022 16:20:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=9B=A2=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/WorkerTeamController.java | 51 +++++++++++++++++++ .../ghy/worker/service/WorkerTeamService.java | 18 +++++++ .../service/impl/WorkerTeamServiceImpl.java | 29 +++++++++++ 3 files changed, 98 insertions(+) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java create mode 100644 ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java create mode 100644 ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java new file mode 100644 index 00000000..aac01190 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java @@ -0,0 +1,51 @@ +package com.ghy.web.controller.worker; + +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.core.page.TableDataInfo; +import com.ghy.common.utils.ExceptionUtil; +import com.ghy.worker.domain.WorkerTeam; +import com.ghy.worker.service.WorkerTeamService; +import org.springframework.stereotype.Controller; +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.ResponseBody; + +import javax.annotation.Resource; +import java.util.List; + +@Controller +@RequestMapping("/worker/team") +public class WorkerTeamController extends BaseController { + + @Resource + private WorkerTeamService workerTeamService; + + @PostMapping("/addTeam") + @ResponseBody + public AjaxResult addTeam(@RequestBody WorkerTeam workerTeam){ + try { + int result = workerTeamService.insertWorkerTeam(workerTeam); + if(result > 0){ + return AjaxResult.success("新增成功"); + }else { + return AjaxResult.warn("新增失败"); + } + }catch (Exception e){ + e.printStackTrace(); + logger.error(e.getMessage()); + return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); + } + } + + @PostMapping("/getTeamList") + @ResponseBody + public TableDataInfo getTeamList(@RequestBody WorkerTeam workerTeam){ + startPage(); + List list = workerTeamService.getWorkerTeam(workerTeam); + return getDataTable(list); + } + +} + diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java new file mode 100644 index 00000000..feef8e28 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java @@ -0,0 +1,18 @@ +package com.ghy.worker.service; + +import com.ghy.worker.domain.WorkerTeam; + +import java.util.List; + +/** + * + * 师傅团队 + * @author clunt + */ +public interface WorkerTeamService { + + public List getWorkerTeam(WorkerTeam workerTeam); + + public int insertWorkerTeam(WorkerTeam workerTeam); + +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java new file mode 100644 index 00000000..4cddbe5c --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java @@ -0,0 +1,29 @@ +package com.ghy.worker.service.impl; + +import com.ghy.worker.domain.WorkerTeam; +import com.ghy.worker.mapper.WorkerTeamMapper; +import com.ghy.worker.service.WorkerTeamService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@Service +public class WorkerTeamServiceImpl implements WorkerTeamService { + + @Resource + private WorkerTeamMapper workerTeamMapper; + + @Override + public List getWorkerTeam(WorkerTeam workerTeam) { + return workerTeamMapper.getWorkerTeamList(workerTeam); + } + + @Override + public int insertWorkerTeam(WorkerTeam workerTeam) { + return workerTeamMapper.insertWorkerTeam(workerTeam); + } + +} From 2423fd9fe24bb2833a3483b75face8599f00119d Mon Sep 17 00:00:00 2001 From: HH Date: Wed, 1 Jun 2022 16:29:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=92=A4=E9=94=80=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 29 +++++---- .../ghy/web/controller/pay/PayController.java | 60 +++++++++++++++++++ .../com/ghy/common/adapay/AdapayConfig.java | 5 ++ ...awCashReply.java => DrawCashCallback.java} | 2 +- .../model/{PayReply.java => PayCallback.java} | 2 +- .../adapay/model/PayReverseCallback.java | 43 +++++++++++++ .../{RefundReply.java => RefundCallback.java} | 2 +- .../ghy/payment/domain/FinancialDetail.java | 17 ++++-- .../payment/mapper/FinancialDetailMapper.java | 7 +++ .../payment/mapper/FinancialMasterMapper.java | 7 +++ .../ghy/payment/service/AdapayService.java | 8 +-- .../service/FinancialDetailService.java | 6 ++ .../service/FinancialMasterService.java | 7 +++ .../impl/FinancialDetailServiceImpl.java | 6 +- .../impl/FinancialMasterServiceImpl.java | 5 ++ .../service/impl/PayCallbackService.java | 6 +- .../impl/PayReverseCallbackService.java | 36 ++++++++++- .../financial/FinancialDetailMapper.xml | 15 ++++- .../financial/FinancialMasterMapper.xml | 4 ++ 19 files changed, 233 insertions(+), 34 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/pay/PayController.java rename ghy-common/src/main/java/com/ghy/common/adapay/model/{DrawCashReply.java => DrawCashCallback.java} (98%) rename ghy-common/src/main/java/com/ghy/common/adapay/model/{PayReply.java => PayCallback.java} (98%) create mode 100644 ghy-common/src/main/java/com/ghy/common/adapay/model/PayReverseCallback.java rename ghy-common/src/main/java/com/ghy/common/adapay/model/{RefundReply.java => RefundCallback.java} (97%) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 6c99805d..f7d572fd 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -6,7 +6,6 @@ import com.ghy.common.utils.StringUtils; import com.ghy.customer.domain.Customer; import com.ghy.customer.service.CustomerService; import com.ghy.goods.domain.DeptGoodsCategory; -import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsStandard; import com.ghy.goods.request.AppGoodsRequest; import com.ghy.goods.service.DeptGoodsCategoryService; @@ -109,7 +108,7 @@ public class OrderController extends BaseController { orderDetailService.insertOrderDetail(od); // 批量生成订单商品 - request.getGoodsList().forEach(goods->{ + request.getGoodsList().forEach(goods -> { OrderGoods orderGoods = new OrderGoods(); orderGoods.setGoodsId(goods.getGoodsStandardId()); orderGoods.setGoodsNum(goods.getNum()); @@ -229,10 +228,10 @@ public class OrderController extends BaseController { * 生成财务子单 * * @param deptGoodsCategoryId 商品类目id - * @param deptId 商户ID - * @param customer 消费者 - * @param payMoney 实付金额 - * @param financialMaster 财务主单 + * @param deptId 商户ID + * @param customer 消费者 + * @param payMoney 实付金额 + * @param financialMaster 财务主单 */ private void createFinancialDetail(Long deptGoodsCategoryId, Long deptId, Customer customer, BigDecimal payMoney, FinancialMaster financialMaster) { // 是否为0元购 是的话下面就不用多级分销了 @@ -247,8 +246,8 @@ public class OrderController extends BaseController { BigDecimal deptTotal = payMoney.multiply(deptRate).add(deptMoney); - FinancialDetail deptDetail = new FinancialDetail(financialDetailService.createCode(), deptId, - financialMaster.getId(), financialMaster.getCode(), deptTotal, 3, null); + FinancialDetail deptDetail = new FinancialDetail(deptId, financialDetailService.createCode(), + financialMaster.getId(), financialMaster.getCode(), deptTotal, 3, null); financialDetailService.insertFinancialDetail(deptDetail); /* 2 截留扣点 */ @@ -257,8 +256,8 @@ public class OrderController extends BaseController { BigDecimal retainTotal = payMoney.multiply(retainRate).add(retainMoney); - FinancialDetail retainDetail = new FinancialDetail(financialDetailService.createCode(), deptId, - financialMaster.getId(), financialMaster.getCode(), retainTotal, 2, null); + FinancialDetail retainDetail = new FinancialDetail(deptId, financialDetailService.createCode(), + financialMaster.getId(), financialMaster.getCode(), retainTotal, 2, null); financialDetailService.insertFinancialDetail(retainDetail); /* 3 分销扣点 */ @@ -271,26 +270,26 @@ public class OrderController extends BaseController { // 一级分销 if (customerPlaceId != null) { - FinancialDetail financialDetail = new FinancialDetail(financialDetailService.createCode(), deptId, + FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), financialMaster.getId(), financialMaster.getCode(), onePlaceMoney, 2, customerPlaceId); financialDetailService.insertFinancialDetail(financialDetail); - }else { + } else { deptPlaceTotal = deptPlaceTotal.add(onePlaceMoney); } // 二级分销 Long parentCustomerPlaceId = customer.getParentCustomerPlace(); if (parentCustomerPlaceId != null) { - FinancialDetail financialDetail = new FinancialDetail(financialDetailService.createCode(), deptId, + FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), financialMaster.getId(), financialMaster.getCode(), twoPlaceMoney, 2, parentCustomerPlaceId); financialDetailService.insertFinancialDetail(financialDetail); - }else { + } else { deptPlaceTotal = deptPlaceTotal.add(twoPlaceMoney); } // 平台分销 deptPlaceTotal = deptPlaceTotal.add(threePlaceMoney); - FinancialDetail financialDetail = new FinancialDetail(financialDetailService.createCode(), deptId, + FinancialDetail financialDetail = new FinancialDetail(deptId, financialDetailService.createCode(), financialMaster.getId(), financialMaster.getCode(), deptPlaceTotal, 2, null); financialDetailService.insertFinancialDetail(financialDetail); } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/PayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/PayController.java new file mode 100644 index 00000000..58d82d42 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/PayController.java @@ -0,0 +1,60 @@ +package com.ghy.web.controller.pay; + +import com.alibaba.fastjson.JSONObject; +import com.ghy.common.adapay.model.AdapayStatusEnum; +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.order.domain.OrderMaster; +import com.ghy.order.service.OrderMasterService; +import com.ghy.payment.domain.FinancialMaster; +import com.ghy.payment.service.AdapayService; +import com.ghy.payment.service.FinancialMasterService; +import com.huifu.adapay.core.exception.BaseAdaPayException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +/** + * @author HH 2022/6/1 + */ +@Controller +@RequestMapping("pay") +public class PayController { + + private static final Logger logger = LoggerFactory.getLogger(PayController.class); + + @Resource + private AdapayService adapayService; + @Resource + private OrderMasterService orderMasterService; + @Resource + private FinancialMasterService financialMasterService; + + /** + * 撤销支付 + * + * @param orderMasterId 主订单ID + * @param reverseAmt 撤销金额 保留两位小数 + */ + @PostMapping("reverse") + @ResponseBody + public AjaxResult reverse(Long orderMasterId, String reverseAmt) throws BaseAdaPayException { + OrderMaster orderMaster = orderMasterService.selectById(orderMasterId); + Assert.notNull(orderMaster, "找不到对应的订单"); + FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); + Assert.notNull(financialMaster, "找不到订单"); + Assert.isTrue(financialMaster.getPayStatus() == 1, "订单未支付"); + Assert.hasText(financialMaster.getPaymentId(), "找不到订单的支付记录，请联系管理员"); + JSONObject response = adapayService.payReverse(orderMaster.getDeptId(), financialMaster.getPaymentId(), reverseAmt); + if (AdapayStatusEnum.succeeded.code.equals(response.getString("status"))) { + return AjaxResult.success(); + } else { + return AjaxResult.error(response.getString("error_msg")); + } + } +} diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayConfig.java b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayConfig.java index 03027edc..9f125c97 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayConfig.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayConfig.java @@ -3,6 +3,8 @@ package com.ghy.common.adapay; import com.ghy.common.adapay.model.Merchant; import com.huifu.adapay.Adapay; import com.huifu.adapay.model.MerConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; @@ -21,6 +23,8 @@ import java.util.stream.Collectors; @EnableConfigurationProperties(AdapayProperties.class) public class AdapayConfig { + private static final Logger logger = LoggerFactory.getLogger(AdapayConfig.class); + /** * 商户配置 */ @@ -38,6 +42,7 @@ public class AdapayConfig { Assert.notEmpty(merchants, "Merchants is empty!"); Map configPathMap = new HashMap<>(merchants.size()); for (Merchant merchant : merchants) { + logger.info("Adapay load merchant : {}", merchant.getDeptId()); check(merchant); MerConfig merConfig = new MerConfig(); merConfig.setApiKey(merchant.getApiKey()); diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashReply.java b/ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashCallback.java similarity index 98% rename from ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashReply.java rename to ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashCallback.java index a4d5a9c0..14431d61 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashReply.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/model/DrawCashCallback.java @@ -9,7 +9,7 @@ import lombok.Data; * @author HH 2022/4/1 */ @Data -public class DrawCashReply { +public class DrawCashCallback { /** * 订单号 diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/model/PayReply.java b/ghy-common/src/main/java/com/ghy/common/adapay/model/PayCallback.java similarity index 98% rename from ghy-common/src/main/java/com/ghy/common/adapay/model/PayReply.java rename to ghy-common/src/main/java/com/ghy/common/adapay/model/PayCallback.java index 892a5512..803c4949 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/model/PayReply.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/model/PayCallback.java @@ -9,7 +9,7 @@ import lombok.Data; * @author HH 2022/3/29 */ @Data -public class PayReply { +public class PayCallback { /** * 返参，必填，由AdaPay生成的支付对象 ID diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/model/PayReverseCallback.java b/ghy-common/src/main/java/com/ghy/common/adapay/model/PayReverseCallback.java new file mode 100644 index 00000000..d49b7c15 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/adapay/model/PayReverseCallback.java @@ -0,0 +1,43 @@ +package com.ghy.common.adapay.model; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +/** + * 撤销支付后Adapay回调接口传过来的数据 + * + * @author HH 2022/5/31 + */ +@Data +public class PayReverseCallback { + + private String id; + private String status; + @JSONField(name = "error_code") + private String errorCode; + @JSONField(name = "error_msg") + private String errorMsg; + @JSONField(name = "error_type") + private String errorType; + @JSONField(name = "prod_mode") + private String prodMode; + @JSONField(name = "order_no") + private String orderNo; + @JSONField(name = "payment_id") + private String paymentId; + @JSONField(name = "reverse_amt") + private String reverseAmt; + @JSONField(name = "reversed_amt") + private String reversedAmt; + @JSONField(name = "confirmed_amt") + private String confirmedAmt; + @JSONField(name = "refunded_amt") + private String refundedAmt; + @JSONField(name = "createdTime") + private String created_time; + @JSONField(name = "succeed_time") + private String succeedTime; + @JSONField(name = "channel_no") + private String channelNo; + private String reason; +} diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/model/RefundReply.java b/ghy-common/src/main/java/com/ghy/common/adapay/model/RefundCallback.java similarity index 97% rename from ghy-common/src/main/java/com/ghy/common/adapay/model/RefundReply.java rename to ghy-common/src/main/java/com/ghy/common/adapay/model/RefundCallback.java index e8804de6..926d8f39 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/model/RefundReply.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/model/RefundCallback.java @@ -9,7 +9,7 @@ import lombok.Data; * @author HH 2022/3/29 */ @Data -public class RefundReply { +public class RefundCallback { /** * 退款目标支付对象 id */ diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java index 1a0082c1..417d308d 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -46,18 +46,24 @@ public class FinancialDetail extends BaseEntity { @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING) private BigDecimal payMoney; - @Excel(name = "财务子单类型,1师傅转派/2多级分销/3平台抽成", cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "财务子单类型,1师傅转派/2多级分销/3平台抽成/4撤销支付或退款", cellType = Excel.ColumnType.NUMERIC) private Integer financialDetailType; /** * 收款人ID * 当财务子单类型是师傅转派时 收款人ID是师傅或徒弟的workerId * 当财务子单类型是多级分销时 收款人ID是分销者的customerId - * 当财务子单类型是平台抽成 无需填写收款人ID + * 当财务子单类型是平台抽成和退款时 无需填写收款人ID */ @Excel(name = "收款人ID", cellType = Excel.ColumnType.NUMERIC) private Long payeeId; + /** + * Adapay撤销支付或退款ID + */ + @Excel(name = "Adapay撤销支付或退款ID", cellType = Excel.ColumnType.STRING) + private String reverseId; + @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) private Integer payType; @@ -74,7 +80,8 @@ public class FinancialDetail extends BaseEntity { this.financialMasterId = financialMasterId; } - public FinancialDetail(String code, Long deptId, Long financialMasterId, String financialMasterCode, BigDecimal payMoney, Integer financialDetailType, Long payeeId) { + public FinancialDetail(Long deptId, String code, Long financialMasterId, String financialMasterCode, + BigDecimal payMoney, Integer financialDetailType, Long payeeId) { this.deptId = deptId; this.code = code; this.financialMasterId = financialMasterId; @@ -84,7 +91,9 @@ public class FinancialDetail extends BaseEntity { this.payeeId = payeeId; } - public FinancialDetail(Long deptId, String code, Long financialMasterId, String financialMasterCode, Long orderDetailId, String orderDetailCode, BigDecimal payMoney, Integer financialDetailType, Long payeeId, Integer payType, Integer payStatus, Date payTime) { + public FinancialDetail(Long deptId, String code, Long financialMasterId, String financialMasterCode, + Long orderDetailId, String orderDetailCode, BigDecimal payMoney, Integer financialDetailType, + Long payeeId, Integer payType, Integer payStatus, Date payTime) { this.deptId = deptId; this.code = code; this.financialMasterId = financialMasterId; diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java index b0eabd39..dc2c7715 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java +++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java @@ -48,4 +48,11 @@ public interface FinancialDetailMapper { * @return 财务细单信息 */ FinancialDetail checkFinancialDetailCodeUnique(String financialDetailCode); + + /** + * 撤销支付成功 + * + * @param reverseId 撤销支付ID + */ + void payReverseSucceeded(String reverseId); } diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java index 5718f61a..5e3bf83c 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java +++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java @@ -57,4 +57,11 @@ public interface FinancialMasterMapper { * @param orderMasterId 主订单ID */ FinancialMaster selectByOrderMasterId(Long orderMasterId); + + /** + * 用支付ID查询主财务单 + * + * @param paymentId 支付ID + */ + FinancialMaster selectByPaymentId(String paymentId); } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/AdapayService.java b/ghy-payment/src/main/java/com/ghy/payment/service/AdapayService.java index 445aae6c..e304a927 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/AdapayService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/AdapayService.java @@ -28,10 +28,10 @@ import java.util.List; @Service public class AdapayService { - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + private static final Logger logger = LoggerFactory.getLogger(AdapayService.class); @Resource - private PayCallbackService payCallBackService; + private PayCallbackService payCallbackService; @Resource private RefundCallbackService refundCallbackService; @Resource @@ -292,7 +292,7 @@ public class AdapayService { paymentParams.put("expend", expend); logger.debug("paymentParams: {}", paymentParams.toJSONString()); JSONObject response = (JSONObject) Payment.create(paymentParams, deptId.toString()); - payCallBackService.onResponse(response); + payCallbackService.onResponse(response); return response; } @@ -382,7 +382,7 @@ public class AdapayService { reverseParams.put("reverse_amt", reverseAmt); reverseParams.put("notify_url", adapayProperties.getNotifyUrl()); reverseParams.put("order_no", "PAYMENT_REVERSE" + System.currentTimeMillis()); - JSONObject response = (JSONObject) PaymentReverse.create(reverseParams); + JSONObject response = (JSONObject) PaymentReverse.create(reverseParams, deptId.toString()); payReverseCallbackService.onResponse(response); return response; } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java index 59075c12..93f796d6 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java @@ -55,4 +55,10 @@ public interface FinancialDetailService { */ String createCode(); + /** + * 撤销支付成功 + * + * @param reverseId 撤销支付ID + */ + void payReverseSucceeded(String reverseId); } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java index db2e00f7..f4ec6416 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialMasterService.java @@ -83,4 +83,11 @@ public interface FinancialMasterService { * @param id 交易ID */ PaymentDTO selectPaymentById(String id); + + /** + * 用支付ID查询主财务单 + * + * @param paymentId 支付ID + */ + FinancialMaster selectByPaymentId(String paymentId); } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java index e2af7150..6185db68 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import static java.time.temporal.ChronoField.*; -import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; @Service public class FinancialDetailServiceImpl implements FinancialDetailService { @@ -73,4 +72,9 @@ public class FinancialDetailServiceImpl implements FinancialDetailService { LocalDateTime now = LocalDateTime.now(); return "fd" + now.format(MINI_FORMATTER) + INDEX.getAndIncrement(); } + + @Override + public void payReverseSucceeded(String reverseId) { + financialDetailMapper.payReverseSucceeded(reverseId); + } } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java index 28117449..fe5b7ea0 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java @@ -108,4 +108,9 @@ public class FinancialMasterServiceImpl implements FinancialMasterService { return paymentMapper.selectById(id); } + @Override + public FinancialMaster selectByPaymentId(String paymentId) { + return financialMasterMapper.selectByPaymentId(paymentId); + } + } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java index 64f2f62f..9ff04e86 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java @@ -2,9 +2,9 @@ package com.ghy.payment.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.ghy.common.adapay.model.Event; import com.ghy.common.adapay.model.AdapayStatusEnum; -import com.ghy.common.adapay.model.PayReply; +import com.ghy.common.adapay.model.Event; +import com.ghy.common.adapay.model.PayCallback; import com.ghy.common.adapay.model.PaymentDTO; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.CallBackService; @@ -37,7 +37,7 @@ public class PayCallbackService implements CallBackService { public void onCallback(Event event) { logger.debug("pay callback is {}", event); String data = event.getData(); - PayReply payment = JSON.parseObject(data, PayReply.class); + PayCallback payment = JSON.parseObject(data, PayCallback.class); Assert.hasText(payment.getOrderNo(), "orderNo is blank !!!"); // 校验是否是本系统发出去的回调请求 boolean ours = orderNoSet.remove(payment.getOrderNo()); diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayReverseCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayReverseCallbackService.java index 7ebee80d..23919acf 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayReverseCallbackService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayReverseCallbackService.java @@ -1,12 +1,22 @@ package com.ghy.payment.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.ghy.common.adapay.model.AdapayStatusEnum; import com.ghy.common.adapay.model.Event; +import com.ghy.common.adapay.model.PayReverseCallback; +import com.ghy.payment.domain.FinancialDetail; +import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.CallBackService; +import com.ghy.payment.service.FinancialDetailService; +import com.ghy.payment.service.FinancialMasterService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.math.BigDecimal; + /** * 撤销支付回调 * @@ -17,13 +27,37 @@ public class PayReverseCallbackService implements CallBackService { private static final Logger logger = LoggerFactory.getLogger(PayReverseCallbackService.class); + @Resource + private FinancialMasterService financialMasterService; + @Resource + private FinancialDetailService financialDetailService; + @Override public void onCallback(Event event) { - logger.debug("撤销支付 callback: {}", event.toString()); + logger.debug("撤销支付 callback: {}", event); + PayReverseCallback callback = JSON.parseObject(event.getData(), PayReverseCallback.class); + if (AdapayStatusEnum.succeeded.code.equals(callback.getStatus())) { + // 将子财务单支付状态设置为1 表示退款成功 + financialDetailService.payReverseSucceeded(callback.getId()); + } } @Override public void onResponse(JSONObject response) { logger.debug("撤销支付 Response: {}", response.toString()); + if (AdapayStatusEnum.succeeded.code.equals(response.getString("status"))) { + String reverseId = response.getString("id"); + String paymentId = response.getString("payment_id"); + String reverseAmt = response.getString("reverse_amt"); + FinancialMaster fm = financialMasterService.selectByPaymentId(paymentId); + // 创建并保存一条子财务单(type=撤销支付) + FinancialDetail fd = new FinancialDetail(fm.getDeptId(), financialDetailService.createCode(), fm.getId(), + fm.getCode(), new BigDecimal(reverseAmt), 4, null); + // 子财务单关联撤销支付ID + fd.setReverseId(reverseId); + financialDetailService.insertFinancialDetail(fd); + } else { + logger.warn("撤销失败: {}", response.toJSONString()); + } } } diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml index 4fb5b666..ab204ca9 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml @@ -17,6 +17,7 @@ + @@ -28,9 +29,9 @@ - SELECT id, dept_id, code, financial_master_id, financial_master_code, order_detail_id, - order_detail_code, total_money, discount_money, pay_money, financial_detail_type, - payee_id, pay_type, pay_status, pay_time, create_by, create_time, update_by, update_time, remark + SELECT id, dept_id, code, financial_master_id, financial_master_code, order_detail_id, order_detail_code, + total_money, discount_money, pay_money, financial_detail_type,payee_id, reverse_id, pay_type, + pay_status, pay_time, create_by, create_time, update_by, update_time, remark FROM financial_detail @@ -89,6 +90,12 @@ WHERE id = #{id} + + UPDATE financial_detail SET + pay_status = 1 + WHERE reverse_id = #{reverseId} + + INSERT INTO financial_detail( @@ -103,6 +110,7 @@ pay_money, financial_detail_type, payee_id, + reverse_id, pay_type, pay_status, pay_time, @@ -120,6 +128,7 @@ #{payMoney}, #{financialDetailType}, #{payeeId}, + #{reverseId}, #{payType}, #{payStatus}, #{payTime}, diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml index e03d9252..c92f7004 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml @@ -56,6 +56,10 @@ WHERE order_master_id = #{orderMasterId} + + DELETE FROM financial_master WHERE id IN From fa166fa42bc11974aa82b10bd55f046e4ff2dabf Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 1 Jun 2022 16:56:09 +0800 Subject: [PATCH 3/7] fix import --- .../main/java/com/ghy/web/controller/order/OrderController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index d7afbeed..ef3f3041 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -8,6 +8,7 @@ import com.ghy.common.utils.StringUtils; import com.ghy.customer.domain.Customer; import com.ghy.customer.service.CustomerService; import com.ghy.goods.domain.DeptGoodsCategory; +import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsStandard; import com.ghy.goods.request.AppGoodsRequest; import com.ghy.goods.service.DeptGoodsCategoryService; From d21a38bad13d7ca13c85f357e3dd763d5564f332 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 1 Jun 2022 18:07:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E5=8F=8A=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ghy/worker/domain/WorkerTeam.java | 4 ++++ .../src/main/resources/mapper/worker/WorkerMapper.xml | 2 ++ .../main/resources/mapper/worker/WorkerTeamMapper.xml | 10 +++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java index 16a4c4c1..f153611c 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerTeam.java @@ -25,6 +25,10 @@ public class WorkerTeam extends BaseEntity { @Excel(name = "成员师傅备注", cellType = Excel.ColumnType.STRING) private String workerName; + private String name; + private String phone; + + private String workerLogoUrl; } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index 82905ad5..bc6a2132 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -76,6 +76,8 @@ account = #{account}, phone = #{phone}, + leader_team_rate = #{leaderTeamRate}, + leader_team_money = #{leaderTeamMoney}, where worker_id = #{workerId} diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml index c832bd9f..4b757930 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml @@ -7,6 +7,9 @@ + + + @@ -34,15 +37,16 @@ - SELECT * - FROM worker_team + SELECT wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url + FROM worker_team wt + left join worker w on wt.worker_id = w.worker_id From 0212e22984c0c5f5cc15ac36bedf769cdb5b22f8 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 1 Jun 2022 18:11:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=92=8C=E6=94=AF?= =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/FinancialDetailController.java | 13 +++++++++++ .../web/pojo/vo/FinancialCountRequest.java | 10 ++++++++ .../web/pojo/vo/FinancialCountResponse.java | 14 +++++++++++ .../payment/mapper/FinancialDetailMapper.java | 6 +++++ .../response/FinancialCountResponse.java | 15 ++++++++++++ .../service/FinancialDetailService.java | 9 ++++++++ .../impl/FinancialDetailServiceImpl.java | 19 +++++++++++++++ .../financial/FinancialDetailMapper.xml | 23 +++++++++++++++++++ 8 files changed, 109 insertions(+) create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountResponse.java create mode 100644 ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java index 91de81ab..b8610cd9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java @@ -6,9 +6,11 @@ import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.enums.BusinessType; +import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.service.FinancialDetailService; +import com.ghy.web.pojo.vo.FinancialCountRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -38,6 +40,17 @@ public class FinancialDetailController extends BaseController { return prefix; } + @PostMapping("/count") + @ResponseBody + public AjaxResult count(@RequestBody FinancialCountRequest request){ + try { + return AjaxResult.success(financialDetailService.count(request.getCountTime())); + }catch (Exception e){ + e.printStackTrace(); + return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); + } + } + @RequiresPermissions("financial:detail:list") @PostMapping("/list") @ResponseBody diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java new file mode 100644 index 00000000..d8a96267 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java @@ -0,0 +1,10 @@ +package com.ghy.web.pojo.vo; + +import lombok.Data; + +@Data +public class FinancialCountRequest { + + private String countTime; + +} diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountResponse.java new file mode 100644 index 00000000..28fb5565 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountResponse.java @@ -0,0 +1,14 @@ +package com.ghy.web.pojo.vo; + +import lombok.Data; + +@Data +public class FinancialCountResponse { + + private String createTime; + + private String payCount; + + private String incomeCount; + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java index dc2c7715..360aadeb 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java +++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java @@ -1,6 +1,7 @@ package com.ghy.payment.mapper; import com.ghy.payment.domain.FinancialDetail; +import com.ghy.payment.response.FinancialCountResponse; import java.util.List; @@ -11,6 +12,11 @@ import java.util.List; */ public interface FinancialDetailMapper { + /** + * @return 月份集合 + */ + List count(FinancialCountResponse response); + /** * @param financialDetail 财务细单属性 * @return 成功条数 diff --git a/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java b/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java new file mode 100644 index 00000000..49489ce5 --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java @@ -0,0 +1,15 @@ +package com.ghy.payment.response; + +import lombok.Data; + +@Data +public class FinancialCountResponse { + + private String createTime; + + private String payCount; + + private String incomeCount; + + private String flag; +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java index 93f796d6..85d064fa 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java @@ -1,8 +1,10 @@ package com.ghy.payment.service; import com.ghy.payment.domain.FinancialDetail; +import com.ghy.payment.response.FinancialCountResponse; import java.util.List; +import java.util.Map; /** * 财务细单接口 @@ -11,6 +13,13 @@ import java.util.List; */ public interface FinancialDetailService { + /** + * @param countTime 是否查询准确时间 + * @param flag 0收入 1支出 + * @return 月份集合 + */ + List count(String countTime); + /** * @param financialDetail 财务细单属性 * @return 成功条数 diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java index 6185db68..b0c98725 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java @@ -4,6 +4,7 @@ import com.ghy.common.constant.UserConstants; import com.ghy.common.core.text.Convert; import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.mapper.FinancialDetailMapper; +import com.ghy.payment.response.FinancialCountResponse; import com.ghy.payment.service.FinancialDetailService; import org.springframework.stereotype.Service; @@ -30,6 +31,24 @@ public class FinancialDetailServiceImpl implements FinancialDetailService { @Resource private FinancialDetailMapper financialDetailMapper; + + @Override + public List count(String countTime) { + FinancialCountResponse request = new FinancialCountResponse(); + request.setCreateTime(countTime); + request.setFlag("true"); + // 查询各月含有收入的费用 + List list = financialDetailMapper.count(request); + list.forEach(financialCountResponse->{ + // 查询指定月支出的 + request.setFlag("false"); + request.setCreateTime(financialCountResponse.getCreateTime()); + financialCountResponse.setPayCount(financialDetailMapper.count(request).get(0).getPayCount()); + }); + return list; + } + + @Override public int insertFinancialDetail(FinancialDetail financialDetail) { return financialDetailMapper.insertFinancialDetail(financialDetail); diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml index ab204ca9..9942a683 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml @@ -27,6 +27,12 @@ + + + + + + SELECT id, dept_id, code, financial_master_id, financial_master_code, order_detail_id, order_detail_code, @@ -96,6 +102,23 @@ WHERE reverse_id = #{reverseId} + + INSERT INTO financial_detail( From e44483498d0ad2099f3210ac9b5626195f9c7340 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 1 Jun 2022 21:29:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=A4=87=E6=B3=A8=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/worker/WorkerTeamController.java | 15 +++++++++++++++ .../com/ghy/worker/mapper/WorkerTeamMapper.java | 6 ++++++ .../com/ghy/worker/service/WorkerTeamService.java | 1 + .../service/impl/WorkerTeamServiceImpl.java | 5 +++++ .../resources/mapper/worker/WorkerTeamMapper.xml | 9 ++++++++- 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java index aac01190..5ca67d65 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java @@ -47,5 +47,20 @@ public class WorkerTeamController extends BaseController { return getDataTable(list); } + @PostMapping("/updateTeam") + @ResponseBody + public AjaxResult updateTeam(@RequestBody WorkerTeam workerTeam){ + try { + int result = workerTeamService.updateWorkerTeam(workerTeam); + if(result > 0){ + return AjaxResult.success("修改成功"); + }else { + return AjaxResult.warn("修改失败"); + } + }catch (Exception e){ + logger.error(e.getMessage()); + return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); + } + } } diff --git a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerTeamMapper.java b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerTeamMapper.java index 717d67b4..02087480 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerTeamMapper.java +++ b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerTeamMapper.java @@ -23,4 +23,10 @@ public interface WorkerTeamMapper { * @return 更新成功条数 */ int deleteWorkerTeamByIds(Long[] ids); + + /** + * @param workerTeam 师傅团队信息 + * @return 修改成功条数 + * */ + int updateWorkerTeam(WorkerTeam workerTeam); } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java index feef8e28..f25aa989 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java @@ -15,4 +15,5 @@ public interface WorkerTeamService { public int insertWorkerTeam(WorkerTeam workerTeam); + int updateWorkerTeam(WorkerTeam workerTeam); } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java index 4cddbe5c..dd9ecfe6 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java @@ -26,4 +26,9 @@ public class WorkerTeamServiceImpl implements WorkerTeamService { return workerTeamMapper.insertWorkerTeam(workerTeam); } + @Override + public int updateWorkerTeam(WorkerTeam workerTeam) { + return workerTeamMapper.updateWorkerTeam(workerTeam); + } + } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml index 4b757930..a8e393cf 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml @@ -37,7 +37,7 @@ - SELECT wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url + SELECT wt.worker_team_id, wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url FROM worker_team wt left join worker w on wt.worker_id = w.worker_id @@ -58,4 +58,11 @@ + + update worker_team + + worker_name = #{workerName} + + where worker_team_id = #{workerTeamId} + From 4cd21aa340151f60d2083ae5d5e4fa0919912962 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 1 Jun 2022 22:06:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=BB=99=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E7=9A=84=E8=B4=A2=E5=8A=A1=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ghy/framework/config/ShiroConfig.java | 1 + .../payment/service/impl/FinancialDetailServiceImpl.java | 7 ++++++- .../resources/mapper/financial/FinancialDetailMapper.xml | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java index 0440cbca..b4f0a0fd 100644 --- a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java +++ b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java @@ -282,6 +282,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/worker/**", "anon"); filterChainDefinitionMap.put("/customer/**", "anon"); filterChainDefinitionMap.put("/goods/**", "anon"); + filterChainDefinitionMap.put("/financial/**", "anon"); filterChainDefinitionMap.put("/tool/**", "anon"); filterChainDefinitionMap.put("/adapay/**", "anon"); filterChainDefinitionMap.put("/system/area/**", "anon"); diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java index b0c98725..c804df2c 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java @@ -43,7 +43,12 @@ public class FinancialDetailServiceImpl implements FinancialDetailService { // 查询指定月支出的 request.setFlag("false"); request.setCreateTime(financialCountResponse.getCreateTime()); - financialCountResponse.setPayCount(financialDetailMapper.count(request).get(0).getPayCount()); + List payCountList = financialDetailMapper.count(request); + if( payCountList != null && payCountList.size() != 0){ + financialCountResponse.setPayCount(payCountList.get(0).getIncomeCount()); + }else { + financialCountResponse.setPayCount("0"); + } }); return list; } diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml index 9942a683..d6301761 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml @@ -104,15 +104,15 @@