|
@@ -46,6 +46,7 @@ import org.springblade.modules.api.request.OrderCommonSaveRequest;
|
|
|
import org.springblade.modules.api.request.OrderConsignRandomRequest;
|
|
|
import org.springblade.modules.api.request.OrderTakeRequest;
|
|
|
import org.springblade.modules.api.response.ConsignResponse;
|
|
|
+import org.springblade.modules.api.service.ITradeService;
|
|
|
import org.springblade.modules.auth.utils.TokenUtil;
|
|
|
import org.springblade.modules.finance.entity.Order;
|
|
|
import org.springblade.modules.finance.entity.OrderConsign;
|
|
@@ -96,6 +97,9 @@ public class Api05Controller extends BladeController {
|
|
|
private final IOrderConsignService orderConsignService;
|
|
|
private final IOrderGrantService orderGrantService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private ITradeService iTradeService;
|
|
|
+
|
|
|
@Resource
|
|
|
private PlatformAuthorizationMapper paMapper;
|
|
|
|
|
@@ -193,8 +197,21 @@ public class Api05Controller extends BladeController {
|
|
|
@PostMapping("checkConsignPay")
|
|
|
@ApiOperation(value = "确认付款id")
|
|
|
public R checkConsignPay(@RequestBody ConsignPayRequest payRequest){
|
|
|
-
|
|
|
- return R.success("确认付款成功");
|
|
|
+ if(ObjectUtil.isNull(payRequest)){
|
|
|
+ return R.fail("参数传递为null");
|
|
|
+ }
|
|
|
+ if(payRequest.getConsignId().size() < 1){
|
|
|
+ return R.fail("请选择打款订单");
|
|
|
+ }
|
|
|
+ if(0 == payRequest.getPayType()){
|
|
|
+ List<Consign> consigns = consignService.listByIds(payRequest.getConsignId());
|
|
|
+ for (Consign consign : consigns) {
|
|
|
+ iTradeService.transfer(consign);
|
|
|
+ }
|
|
|
+ return R.success("确认付款成功");
|
|
|
+ } else {
|
|
|
+ return R.fail("当前不支持特殊用户打款");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|