diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java b/yqzjAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java deleted file mode 100644 index 5fd66d5..0000000 --- a/yqzjAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.iformall.controller.market; - -import com.iformall.annotation.SystemControllerLog; -import com.iformall.controller.base.BaseController; -import io.swagger.annotations.Api; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; -import com.iformall.common.ResultData; - -import com.iformall.domain.po.WxRefundOrder; -import com.iformall.service.WxRefundOrderService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("/refund") -@Api(description = "微信退款订单接口") -public class WxRefundOrderController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private WxRefundOrderService wxRefundOrderService; - - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "退款-列表") - public ResultData list(@ModelAttribute WxRefundOrder wxRefundOrder, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxRefundOrderController::list"); - if (null == wxRefundOrder) wxRefundOrder = new WxRefundOrder(); - final PageInfo page = wxRefundOrderService.listAsPage(wxRefundOrder, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - @SystemControllerLog(description = "退款-新增") - public ResultData add(@RequestBody WxRefundOrder wxRefundOrder) { - logger.debug("[" + getIpAddr() + "] WxRefundOrderController::add"); - //Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxRefundOrderService.saveOrUpdate(wxRefundOrder); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - @SystemControllerLog(description = "退款-更新") - public ResultData update(@RequestBody WxRefundOrder wxRefundOrder) { - logger.debug("[" + getIpAddr() + "] WxRefundOrderController::update"); - wxRefundOrderService.saveOrUpdate(wxRefundOrder); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "退款-根据id删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxRefundOrderController::delete"); - wxRefundOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "退款-id查询") - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxRefundOrderController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxRefundOrderService.getById(id)); - } - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxRefundOrderService.java b/yqzjService/src/main/java/com/iformall/service/WxRefundOrderService.java deleted file mode 100644 index f10f523..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxRefundOrderService.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.douyin.payv2.result.RefundOrderCallback; -import com.iformall.enums.EnumPayType; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; - -import java.util.Map; - - -public interface WxRefundOrderService { - - /** - * 创建退款订单 - * @param - * @param couponOrderId 券包Id - * @param payType 退款来源 - * @param bUser b端退款Id,auto,admin,self可为null - * @return - */ - ResultData createRefundOrder(TenantEntity tenantEntity, Long couponOrderId, EnumPayType payType, WxMerchantBUser bUser, Long aUserId); - - /** - * 创建退款订单 - * @param appInfo - * @param orderId 订单Id - * @param payType 退款来源 - * @param bUserId b端退款Id,auto,admin,self可为null - * @return - */ - ResultData createRefundOrderFromMicroPay(WxAppinfo appInfo, Long orderId, EnumPayType payType, Long bUserId); - - /** - * 退款订单查询 - * @param appInfo - * @param record - * @return - */ - ResultData queryRefundOrder(WxAppinfo appInfo, WxRefundOrder record); - - /** - * 处理退款成功 - * @param record - */ - void handleRefundSuccess(WxRefundOrder record); - - /** - * 页面回调 - * @param paramMap 页面通知参数 - * @param payWay 支付方式 - * @return - */ - void callback(Map paramMap, EnumPayWay payWay); - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxRefundOrder record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxRefundOrder getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxRefundOrder record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - ResultData returnMoney(WxAppinfo appInfo, Long orderId); - - boolean hasRefundOrder(Long orderId, Integer status); - - void actionAfterCouponOrder(WxOrder wxOrder, WxCUserBasicInfo basicInfo); - - WxRefundOrder findRefundOrder(TenantEntity tenantInfo, Long orderId); - - /** - * 抖音2.0 退款回调创建退款订单 - * @param tenantEntity - * @param memberId - * @param refundOrderCallback - * @return - */ - ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback); - - ResultData syncRefundOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxRefundOrder order); -}