Commit 8a85d934 by Java-聂换换

HL2通道支付

parent 021df1c2
...@@ -7,9 +7,11 @@ import com.thinkgem.jeesite.modules.pay.entity.OrderEntity; ...@@ -7,9 +7,11 @@ import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
import com.thinkgem.jeesite.modules.pay.juhezhong.dto.PayBackDto; import com.thinkgem.jeesite.modules.pay.juhezhong.dto.PayBackDto;
import com.thinkgem.jeesite.modules.pay.service.PayApiService; import com.thinkgem.jeesite.modules.pay.service.PayApiService;
import com.thinkgem.jeesite.modules.sys.entity.Dict; import com.thinkgem.jeesite.modules.sys.entity.Dict;
import com.thinkgem.jeesite.modules.sys.entity.DictPayChannel;
import com.thinkgem.jeesite.modules.sys.service.DictService; import com.thinkgem.jeesite.modules.sys.service.DictService;
import com.thinkgem.jeesite.modules.user.bean.JuHeZhongPayRequest; import com.thinkgem.jeesite.modules.user.bean.JuHeZhongPayRequest;
import com.thinkgem.jeesite.modules.user.bean.UserRequest; import com.thinkgem.jeesite.modules.user.bean.UserRequest;
import com.thinkgem.jeesite.modules.user.entity.BelongBankEntity;
import com.thinkgem.jeesite.modules.user.entity.CardEntity; import com.thinkgem.jeesite.modules.user.entity.CardEntity;
import com.thinkgem.jeesite.modules.user.entity.CardSwpaccidEntity; import com.thinkgem.jeesite.modules.user.entity.CardSwpaccidEntity;
import com.thinkgem.jeesite.modules.user.service.UserApiService; import com.thinkgem.jeesite.modules.user.service.UserApiService;
...@@ -293,9 +295,21 @@ public class PayApiController { ...@@ -293,9 +295,21 @@ public class PayApiController {
@RequestMapping("/getDict") @RequestMapping("/getDict")
public Response getDict(Dict dict){ public Response getDict(Dict dict){
Response response = new Response(); Response response = new Response();
List<Dict> list = dictService.findList(dict);
if("pay_channel".equals(dict.getType())){
List<DictPayChannel> list = dictService.findDictListPayChannel(dict);
for(DictPayChannel dictList:list){
// 查询支持的银行
dictList.setBankList(userApiService.getBelongBankByPayChannel(dictList.getValue()));
}
response.setStatus(ComCode.STATUS_CODE_2000); response.setStatus(ComCode.STATUS_CODE_2000);
response.setData(list); response.setData(list);
}else{
List<Dict> list = dictService.findDictList(dict);
response.setStatus(ComCode.STATUS_CODE_2000);
response.setData(list);
}
return response; return response;
} }
} }
...@@ -8,6 +8,7 @@ import java.util.List; ...@@ -8,6 +8,7 @@ import java.util.List;
import com.thinkgem.jeesite.common.persistence.CrudDao; import com.thinkgem.jeesite.common.persistence.CrudDao;
import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao; import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
import com.thinkgem.jeesite.modules.sys.entity.Dict; import com.thinkgem.jeesite.modules.sys.entity.Dict;
import com.thinkgem.jeesite.modules.sys.entity.DictPayChannel;
/** /**
* 字典DAO接口 * 字典DAO接口
...@@ -21,4 +22,6 @@ public interface DictDao extends CrudDao<Dict> { ...@@ -21,4 +22,6 @@ public interface DictDao extends CrudDao<Dict> {
public List<Dict> findDictList(Dict dict); public List<Dict> findDictList(Dict dict);
public List<DictPayChannel> findDictListPayChannel(Dict dict);
} }
package com.thinkgem.jeesite.modules.sys.entity;
import com.thinkgem.jeesite.modules.user.entity.BelongBankEntity;
import java.util.List;
public class DictPayChannel extends Dict {
private List<BelongBankEntity> bankList;
public List<BelongBankEntity> getBankList() {
return bankList;
}
public void setBankList(List<BelongBankEntity> bankList) {
this.bankList = bankList;
}
}
...@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.sys.service; ...@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.sys.service;
import java.util.List; import java.util.List;
import com.thinkgem.jeesite.modules.sys.entity.DictPayChannel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -47,4 +48,7 @@ public class DictService extends CrudService<DictDao, Dict> { ...@@ -47,4 +48,7 @@ public class DictService extends CrudService<DictDao, Dict> {
return dao.findDictList(dict); return dao.findDictList(dict);
} }
public List<DictPayChannel> findDictListPayChannel(Dict dict){
return dao.findDictListPayChannel(dict);
}
} }
...@@ -79,6 +79,8 @@ public interface UserApiDao { ...@@ -79,6 +79,8 @@ public interface UserApiDao {
List<BelongBankEntity> getBelongBank(UserRequest request); List<BelongBankEntity> getBelongBank(UserRequest request);
List<BelongBankEntity> getBelongBankByPayChannel(UserRequest request);
BelongBankEntity getBelongBankEntity(UserRequest request); BelongBankEntity getBelongBankEntity(UserRequest request);
Level getLevelByUserLevel(UserRequest request); Level getLevelByUserLevel(UserRequest request);
......
...@@ -699,4 +699,12 @@ public class UserApiService { ...@@ -699,4 +699,12 @@ public class UserApiService {
userEntity.setCode(userCode); userEntity.setCode(userCode);
return userDao.getUserDetailByCode(userEntity); return userDao.getUserDetailByCode(userEntity);
} }
public List<BelongBankEntity> getBelongBankByPayChannel(String payChannel){
UserRequest request = new UserRequest();
request.setPayChannel(payChannel);
return userDao.getBelongBankByPayChannel(request);
}
} }
...@@ -105,4 +105,17 @@ ...@@ -105,4 +105,17 @@
ORDER BY sort DESC ORDER BY sort DESC
</select> </select>
<select id="findDictListPayChannel" resultType="com.thinkgem.jeesite.modules.sys.entity.DictPayChannel">
SELECT
value,
label
FROM sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL}
<if test="type != null and type != ''">
AND type = #{type}
</if>
ORDER BY sort DESC
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -692,6 +692,26 @@ ...@@ -692,6 +692,26 @@
</select> </select>
<select id="getBelongBankByPayChannel" resultType="com.thinkgem.jeesite.modules.user.entity.BelongBankEntity">
SELECT
yb.id,
yb.code,
yb.bank_code AS bankCode,
yb.bank_name AS bankName,
yb.bank_short AS bankShort,
yb.create_date AS created,
yb.create_by AS createdUser,
yb.update_date AS modified,
yb.update_by AS modifiedUser,
yb.del_flag AS delFlag
FROM
youka_bank yb
WHERE
del_flag = '0'
AND support_pay_channel like concat('%',#{payChannel},',%')
</select>
<select id="getBelongBankEntity" resultType="com.thinkgem.jeesite.modules.user.entity.BelongBankEntity"> <select id="getBelongBankEntity" resultType="com.thinkgem.jeesite.modules.user.entity.BelongBankEntity">
SELECT SELECT
yb.id, yb.id,
...@@ -767,7 +787,7 @@ ...@@ -767,7 +787,7 @@
</select> </select>
<select id="getDebitCardByUserCode" resultType="com.thinkgem.jeesite.modules.user.entity.CardEntity"> <select id="getCardByCardNo" resultType="com.thinkgem.jeesite.modules.user.entity.CardEntity">
SELECT SELECT
yc.id, yc.id,
yc.code, yc.code,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment