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

添加汇付支付

This commit is contained in:
韩鹏辉 2024-01-31 16:07:53 +08:00
parent 6aa568c96a
commit 0d1fb8d630
11 changed files with 914 additions and 740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
newadmin/admin/pom.xml
View File

@ -10,8 +10,6 @@
<artifactId>admin</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>

7
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
View File

@ -139,10 +139,13 @@ public class MerchantChannelStatusController {
*/
@GetMapping(value = "/manualMerchantIncom")
public RespBody manualMerchantIncome(@RequestParam("userId") String userId, @RequestParam("channelId") String channelId,
@RequestParam("type")String type, @RequestParam("errMsg")String errMsg){
@RequestParam("type")String type, @RequestParam("errMsg")String errMsg,
@RequestParam("wxLiteAppId") String wxLiteAppId,@RequestParam("wxPubAppId") String wxPubAppId,
@RequestParam("wxPubPath") String wxPubPath
){
if ("1".equals(type)) {
//进件
merchantService.merchantAudit(userId, channelId);
merchantService.merchantAudit(userId, channelId,wxLiteAppId,wxPubAppId,wxPubPath);
}else if ("2".equals(type)){
//驳回
merchantService.rejectAudit(userId,errMsg);

19
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/NotifyController.java
View File

@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.merchant.service.HfMerService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@Slf4j
@RestController
@ -61,4 +61,19 @@ public class NotifyController {
hfMerService.merchantResident(userId,null);
return "SUCCESS";
}
@PostMapping("createStore")
public String createStore(@RequestParam("userId") String userId){
hfMerService.createStore(userId);
return "SUCCESS";
}
@PostMapping("modifySettle")
public String modifySettle(@RequestParam("userId") String userId){
hfMerService.modifySettle(userId);
return "SUCCESS";
}
}

2
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/LoginInterceptor.java
View File

@ -42,6 +42,8 @@ public class LoginInterceptor implements HandlerInterceptor {
if("/admin/notifyCallback/feedCallBack".equals(requestURI)||"/admin/notifyCallback/merchantResident".equals(requestURI)
||"/admin/notifyCallback/testFeedCallBack".equals(requestURI)
||"/admin/notifyCallback/authUser".equals(requestURI)
||"/admin/notifyCallback/createStore".equals(requestURI)
||"/admin/notifyCallback/modifySettle".equals(requestURI)
){
return true;
}

1
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantHfInfoMapper.java
View File

@ -20,6 +20,7 @@ public interface TbPlussMerchantHfInfoMapper {
int updateByPrimaryKey(TbPlussMerchantHfInfo record);
TbPlussMerchantHfInfo selectByMerchantCodeAndSubApiKey(@Param("merchantCode") String merchantCode, @Param("liveApiKey") String liveApiKey);

10
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantHfInfo.java
View File

@ -24,6 +24,8 @@ public class TbPlussMerchantHfInfo implements Serializable {
private String privKey;
private String wxInfo;
private String loginPwd;
private Date createTime;
@ -112,6 +114,14 @@ public class TbPlussMerchantHfInfo implements Serializable {
this.privKey = privKey == null ? null : privKey.trim();
}
public String getWxInfo() {
return wxInfo;
}
public void setWxInfo(String wxInfo) {
this.wxInfo = wxInfo == null ? null : wxInfo.trim();
}
public String getLoginPwd() {
return loginPwd;
}

24
newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantHfInfoMapper.xml
View File

@ -12,13 +12,14 @@
<result column="app_name" jdbcType="VARCHAR" property="appName" />
<result column="puc_key" jdbcType="VARCHAR" property="pucKey" />
<result column="priv_key" jdbcType="VARCHAR" property="privKey" />
<result column="wx_info" jdbcType="VARCHAR" property="wxInfo" />
<result column="login_pwd" jdbcType="VARCHAR" property="loginPwd" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, merchant_code, status, test_api_key, live_api_key, app_id_list, app_id, app_name,
puc_key, priv_key, login_pwd, create_time, update_time
puc_key, priv_key, wx_info, login_pwd, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@ -28,8 +29,6 @@
</select>
<select id="selectByMerchantCodeAndSubApiKey" resultMap="BaseResultMap">
select * from tb_pluss_merchant_hf_info where merchant_code=#{merchantCode} and live_api_key=#{liveApiKey}
</select>
@ -38,7 +37,6 @@
select * from tb_pluss_merchant_hf_info where merchant_code=#{merchantCode} order by id desc limit 1
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tb_pluss_merchant_hf_info
where id = #{id,jdbcType=INTEGER}
@ -47,13 +45,13 @@
insert into tb_pluss_merchant_hf_info (id, merchant_code, status,
test_api_key, live_api_key, app_id_list,
app_id, app_name, puc_key,
priv_key, login_pwd, create_time,
update_time)
priv_key, wx_info, login_pwd,
create_time, update_time)
values (#{id,jdbcType=INTEGER}, #{merchantCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{testApiKey,jdbcType=VARCHAR}, #{liveApiKey,jdbcType=VARCHAR}, #{appIdList,jdbcType=VARCHAR},
#{appId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, #{pucKey,jdbcType=VARCHAR},
#{privKey,jdbcType=VARCHAR}, #{loginPwd,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
#{privKey,jdbcType=VARCHAR}, #{wxInfo,jdbcType=VARCHAR}, #{loginPwd,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.chaozhanggui.dao.system.entity.TbPlussMerchantHfInfo">
insert into tb_pluss_merchant_hf_info
@ -88,6 +86,9 @@
<if test="privKey != null">
priv_key,
</if>
<if test="wxInfo != null">
wx_info,
</if>
<if test="loginPwd != null">
login_pwd,
</if>
@ -129,6 +130,9 @@
<if test="privKey != null">
#{privKey,jdbcType=VARCHAR},
</if>
<if test="wxInfo != null">
#{wxInfo,jdbcType=VARCHAR},
</if>
<if test="loginPwd != null">
#{loginPwd,jdbcType=VARCHAR},
</if>
@ -170,6 +174,9 @@
<if test="privKey != null">
priv_key = #{privKey,jdbcType=VARCHAR},
</if>
<if test="wxInfo != null">
wx_info = #{wxInfo,jdbcType=VARCHAR},
</if>
<if test="loginPwd != null">
login_pwd = #{loginPwd,jdbcType=VARCHAR},
</if>
@ -193,6 +200,7 @@
app_name = #{appName,jdbcType=VARCHAR},
puc_key = #{pucKey,jdbcType=VARCHAR},
priv_key = #{privKey,jdbcType=VARCHAR},
wx_info = #{wxInfo,jdbcType=VARCHAR},
login_pwd = #{loginPwd,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}

16
newadmin/merchant-service-api/pom.xml
View File

@ -103,6 +103,22 @@
<scope>system</scope>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dysmsapi20170525</artifactId>
<version>2.0.21</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-geoip</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
</project>

1568
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
View File

File diff suppressed because it is too large Load Diff

4
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
View File

@ -48,7 +48,7 @@ public class MerchantService {
* @param userId
* @param channelId
*/
public void merchantAudit(String userId, String channelId){
public void merchantAudit(String userId, String channelId,String wxLiteAppId,String wxPubAppId,String wxPubPath){
MsgException.checkBlank(channelId, "请选择进件通道");
MsgException.checkNull(userId,"请选择用户");
@ -109,7 +109,7 @@ public class MerchantService {
ysAuditServiceV3.merchantAuditV3(userId,false, Integer.valueOf(channelId));
break;
case "7":
hfMerService.feed(baseInfo,channelStatus);
hfMerService.feed(baseInfo,channelStatus,wxLiteAppId,wxPubAppId,wxPubPath);
break;
default:
MsgException.throwException("未知的进件通道");

1
newadmin/pom.xml
View File

@ -104,6 +104,7 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>