diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/HnaPayController.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/HnaPayController.java index dc6d149..e02412e 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/HnaPayController.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/controller/HnaPayController.java @@ -3,6 +3,7 @@ package com.shop.cereshop.admin.controller; import com.shop.cereshop.admin.annotation.NoRepeatSubmit; import com.shop.cereshop.admin.annotation.NoRepeatWebLog; import com.shop.cereshop.admin.param.business.BusinessHnapayCreateParam; +import com.shop.cereshop.admin.param.business.BusinessPayModeParam; import com.shop.cereshop.admin.pay.hnapay.HnaPayService; import com.shop.cereshop.admin.service.bhnapay.CereBusinessHnapayService; import com.shop.cereshop.admin.service.business.CerePlatformBusinessService; @@ -112,8 +113,21 @@ public class HnaPayController { @ApiOperation(value = "根据商家id获取新账通配置信息") @NoRepeatWebLog public Result getHnaPayInfo(@PathVariable Long businessId) throws CoBusinessException{ - //校验商家名称是否存在 CereBusinessHnapay hnapay = businessHnapayService.getByBusinessId(businessId); return new Result(hnapay, ""); } + + @PostMapping(value = "changeBusinessPayMode") + @ApiOperation(value = "商家新账通支付开关") + @NoRepeatWebLog + public Result changeBusinessPayMode(@RequestBody BusinessPayModeParam param){ + Integer payMode = 0; + if (param.getType() == 1) { + payMode = param.getEnable() ? 1 : 0; + }else { + payMode = param.getEnable() ? 2 : 0; + } + businessService.changeBusinessPayMode(param.getBusinessId(), payMode); + return new Result("success", ""); + } } diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessDAO.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessDAO.java index 0c707ee..ee930a5 100644 --- a/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessDAO.java +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/dao/business/CerePlatformBusinessDAO.java @@ -73,4 +73,6 @@ public interface CerePlatformBusinessDAO extends BaseMapper + + update cere_platform_business set pay_mode=#{payMode} where business_id = #{businessId} + + diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/business/CerePlatformBusiness.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/business/CerePlatformBusiness.java index 8075081..7179a6e 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/business/CerePlatformBusiness.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/business/CerePlatformBusiness.java @@ -221,6 +221,12 @@ public class CerePlatformBusiness implements Serializable { @ApiModelProperty(value = "新账通开户审核状态") private String hnapayStatus; + /** + * 商家支付模式:0-新生支付 1-新账通 2-原生微信支付宝 + */ + @ApiModelProperty(value = "商家支付模式") + private Integer payMode; + private static final long serialVersionUID = 1L; } diff --git a/doc/3.0/update.sql b/doc/3.0/update.sql index 366691a..cc51737 100644 --- a/doc/3.0/update.sql +++ b/doc/3.0/update.sql @@ -341,4 +341,5 @@ CREATE TABLE `cere_business_wxpay` ( ALTER TABLE cere_platform_business ADD hna_pay_id varchar(256) DEFAULT '' COMMENT '新账通支付商户Id/分账方id'; ALTER TABLE cere_platform_business ADD bind_card_agr_no varchar(30) DEFAULT '' COMMENT '新账通支付绑卡协议号'; ALTER TABLE cere_platform_business ADD COLUMN hnapay_status tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '0-待上传 1-审核中 2-审核通过 3-审核拒绝' AFTER bind_card_agr_no; +ALTER TABLE cere_platform_business ADD COLUMN pay_mode tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '商家支付模式:0-新生支付 1-新账通 2-原生微信支付宝';