czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

D1D0数据同步，提现审核相关

Browse Source
This commit is contained in:
liuyingfang
2023-07-06 17:01:21 +08:00
parent f0174ef087
commit a473fd6457
10 changed files with 271 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java
View File

@@ -7,6 +7,7 @@ import cn.pluss.platform.cash.CashService;
import cn.pluss.platform.entity.Cash;
import cn.pluss.platform.entity.UserApp;
import cn.pluss.platform.entity.WxBankCode;
import cn.pluss.platform.userApp.UserAppService;
import cn.pluss.platform.util.*;
import cn.pluss.platform.wxBankCode.WxBankCodeService;
import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
@@ -33,6 +35,8 @@ public class CashController {
private final CashService cashService;
private final WxBankCodeService wxBankCodeService;
@Resource
private UserAppService userAppService;
@GetMapping({ "", "/v3" })
@ApiOperation(tags = { "页面-提现记录" }, value = "获取分页提现记录", notes = "返回分页过后的数据", httpMethod = "GET")
@@ -91,4 +95,34 @@ public class CashController {
return ResultGenerator.genSuccessResult();
}
/**
* 下级相关
* @param
* @return
*/
@GetMapping("/subordinate")
public Result<Object> subordinate(@RequestParam("status") String status, @RequestParam("size") Integer size,
@RequestParam("page") Integer page){
UserApp tokenUa = userAppService.queryUserAppByToken();
List<Cash> subordinate = cashService.subordinate(tokenUa.getUserId().toString(),status, size, page);
return ResultGenerator.genSuccessResult(subordinate);
}
/**
* 提现审核
*/
@GetMapping ("/examine")
public Result<Object> examine(@RequestParam("id") Integer id,@RequestParam("status") String status,
@RequestParam("remark") String remark){
UserApp tokenUa = userAppService.queryUserAppByToken();
try {
Boolean aBoolean = cashService.modifyOutFlow(id, String.valueOf(tokenUa.getUserId()), status, remark);
if (aBoolean){
return ResultGenerator.genSuccessResult();
}
}catch (Exception e){
e.printStackTrace();
}
return ResultGenerator.genFailResult("");
}
}

45
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
View File

@@ -21,6 +21,7 @@ import cn.pluss.platform.merchantIncome.MerchantIncomeService;
import cn.pluss.platform.merchantMenber.MerchantMenberService;
import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
import cn.pluss.platform.merchantOrder.MerchantOrderService;
import cn.pluss.platform.merchantProfit.MerchantProfitService;
import cn.pluss.platform.notice.NoticeService;
import cn.pluss.platform.pay.PayService;
import cn.pluss.platform.pos.BasePosReq;
@@ -54,8 +55,10 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -534,17 +537,41 @@ public class MerchantOrderController {
}
@Resource
private MerchantProfitService profitService;
@PostMapping("/orderTest")
public Result<Object> orderTest(@RequestBody MerchantOrder merchantOrder){
UserApp tokenUa = userAppService.queryUserAppByToken();
merchantOrder.setOrderNumber("TEST"+StringUtil.getBillno());
merchantOrder.setOrderType("2");
merchantOrder.setMerchantCode(tokenUa.getMerchantCode());
merchantOrder.setMerchantName("尖愁");
merchantOrder.setPayTypeCode("wechatPay");
merchantOrder.setPayTypeName("微信");
merchantOrder.setStoreId("0ZZC7Q");
merchantOrder.setStoreName("尖愁");
merchantOrder.setTransDt(new Date());
merchantOrder.setCreateDt(new Date());
merchantOrder.setStatus("1");
merchantOrder.setEnterFee(merchantOrder.getConsumeFee());
merchantOrder.setAisleSwitch("0");
merchantOrder.setRate(new BigDecimal("38.00"));
merchantOrder.setSettlementType(1);
merchantOrder.setChannelRate(new BigDecimal("21.00"));
merchantOrder.setChannelFee(new BigDecimal("0.00"));
merchantOrder.setMercFee(new BigDecimal("0.00"));
boolean save = merchantOrderService.save(merchantOrder);
profitService.createOrderProfitV2(merchantOrder,"1");
if (save){
return ResultGenerator.genSuccessResult();
}else {
return ResultGenerator.genFailResult("失败");
}
}
/**
* 主扫会员支付