|
@@ -33,9 +33,12 @@ import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.core.tool.api.R;
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
|
|
+import org.springblade.pay.tonglianPayment.entity.Parameters;
|
|
|
|
|
+import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
|
|
|
import org.springblade.salesPart.entity.PjProductLaunch;
|
|
import org.springblade.salesPart.entity.PjProductLaunch;
|
|
|
import org.springblade.salesPart.entity.PjProductLaunchFiles;
|
|
import org.springblade.salesPart.entity.PjProductLaunchFiles;
|
|
|
import org.springblade.salesPart.entity.PjShoppingCart;
|
|
import org.springblade.salesPart.entity.PjShoppingCart;
|
|
|
|
|
+import org.springblade.salesPart.payMethod.PayService;
|
|
|
import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
|
|
import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
|
|
|
import org.springblade.salesPart.shoppingCart.service.IShoppingCartService;
|
|
import org.springblade.salesPart.shoppingCart.service.IShoppingCartService;
|
|
|
import org.springblade.salesPart.vo.ShoppingCartVO;
|
|
import org.springblade.salesPart.vo.ShoppingCartVO;
|
|
@@ -61,6 +64,8 @@ public class ShoppingCartController extends BladeController {
|
|
|
private final IShoppingCartService shoppingCartService;
|
|
private final IShoppingCartService shoppingCartService;
|
|
|
private final IProductLaunchFilesService productLaunchFilesService;
|
|
private final IProductLaunchFilesService productLaunchFilesService;
|
|
|
|
|
|
|
|
|
|
+ private final IPaymentClient paymentClient;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 详情
|
|
* 详情
|
|
|
*/
|
|
*/
|
|
@@ -232,5 +237,16 @@ public class ShoppingCartController extends BladeController {
|
|
|
return shoppingCartService.generateOrderShare(pjShoppingCart.getAddress(), pjShoppingCart.getShoppingCartList(), pjShoppingCart.getPayType());
|
|
return shoppingCartService.generateOrderShare(pjShoppingCart.getAddress(), pjShoppingCart.getShoppingCartList(), pjShoppingCart.getPayType());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @PostMapping("/getPaymentType")
|
|
|
|
|
+ public R<String> getPaymentType() {
|
|
|
|
|
+ R<Parameters> parametersR = paymentClient.getByTenantId(AuthUtil.getTenantId());
|
|
|
|
|
+ if (!parametersR.isSuccess()) {
|
|
|
|
|
+ return R.fail("未查到支付类型");
|
|
|
|
|
+ }
|
|
|
|
|
+ if (ObjectUtil.isEmpty(parametersR.getData())) {
|
|
|
|
|
+ return R.fail("未查到支付类型数据");
|
|
|
|
|
+ }
|
|
|
|
|
+ return R.data(parametersR.getData().getPayType());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
}
|
|
}
|