diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/HnaPayService.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/HnaPayService.java new file mode 100644 index 0000000..d606029 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/HnaPayService.java @@ -0,0 +1,84 @@ +package com.shop.cereshop.admin.pay.hnapay; + +import com.shop.cereshop.admin.pay.PayService; +import com.shop.cereshop.commons.exception.CoBusinessException; + +import java.math.BigDecimal; +import java.util.Map; + +/** + * 描述： + * + * @author stevenhu + * @version 2025/02/18 9:27 + */ +public interface HnaPayService extends PayService { + + /** + * 企业开户 + * @param entId 企业id + * @param userName 企业名称 + * @param mobile 企业联系人手机号 + * @param certNo 营业执照号(统一社会信用代码) + * @param certValidate 证件有效期 格式：YYYYMMDD 永久则输入21990101 + * @param cardNo 银行卡号 + * @param bankCode 银行简码 + * @param province 开户行所属省份 + * @param city 开户行所属城市 + * @param branch 开户支行 + * @return + */ + Map createEntAccount(Long entId, String userName, String mobile, String certNo, String certValidate, String cardNo, + String bankCode, String province, String city, String branch); + + + /** + * 企业开户上传资料 + * @param userId 开户返回的userId + * @param certFileType + * 1-身份证正面；（企业必传） + * 2-身份证反面；（企业必传） + * 3-法人身份证手持；（非必传） + * 4-营业执照；（企业必传） + * 5-其他；（非必传） + * 6-其他；（非必传） + * 7-开户许可证；（企业必传） + * @param base64 上传图片base64为 + * @return + */ + Map uploadEntFile(String userId,String certFileType, String base64); + + /** + * 企业开户修改 + * @param userId 开户返回的userId + * @param certNo 营业执照号(统一社会信用代码) + * @param userName 企业名称 + * @param mobile 企业联系人手机号 + * @param certValidate 证件有效期 格式：YYYYMMDD 永久则输入21990101 + * @return + */ + Map modifyEntAccount(String userId, String certNo, String userName, String mobile, String certValidate); + + /** + * 企业换卡 + * @param userId 开户返回的用户编号 + * @param bindCardAgrNo 原绑卡协议号 开户接口返回 + * @param mobile 银行预留手机号 + * @param cardNo 银行卡号 + * @param bankCode 银行简码 + * @param province 开户行所属省份 + * @param city 开户行所属城市 + * @param branch 开户支行 + * @return + */ + Map changeEntCard(String userId, String bindCardAgrNo, String mobile, String cardNo, String bankCode, String province, String city, String branch); + + + /** + * 提现 + * @return + * @throws CoBusinessException + */ + String getMoney(Long businessId, String orderFormid, + String tradeType, BigDecimal money) throws CoBusinessException; +} diff --git a/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/impl/HnaPayServiceImpl.java b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/impl/HnaPayServiceImpl.java new file mode 100644 index 0000000..9efdca3 --- /dev/null +++ b/cereshop-admin/src/main/java/com/shop/cereshop/admin/pay/hnapay/impl/HnaPayServiceImpl.java @@ -0,0 +1,265 @@ +package com.shop.cereshop.admin.pay.hnapay.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.gson.Gson; +import com.shop.cereshop.admin.dao.order.CereOrderProductDAO; +import com.shop.cereshop.admin.dao.order.CereShopOrderDAO; +import com.shop.cereshop.admin.dao.shop.CereShopBankDAO; +import com.shop.cereshop.admin.page.business.Business; +import com.shop.cereshop.admin.page.business.BusinessGetAll; +import com.shop.cereshop.admin.pay.hnapay.HnaPayService; +import com.shop.cereshop.admin.service.business.CerePlatformBusinessService; +import com.shop.cereshop.admin.service.shop.CerePlatformShopService; +import com.shop.cereshop.commons.config.HnaPayConfig; +import com.shop.cereshop.commons.constant.WxPayEnum; +import com.shop.cereshop.commons.domain.business.CerePlatformBusiness; +import com.shop.cereshop.commons.domain.order.CereOrderParent; +import com.shop.cereshop.commons.domain.order.CereOrderProduct; +import com.shop.cereshop.commons.domain.order.CereShopOrder; +import com.shop.cereshop.commons.domain.shop.CerePlatformShop; +import com.shop.cereshop.commons.domain.shop.CereShopBank; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.request.hnapay.form.*; +import com.shop.cereshop.commons.request.hnapay.init.InitForm; +import com.shop.cereshop.commons.utils.EmptyUtils; +import com.shop.cereshop.commons.utils.hnapay.HttpUtils; +import com.shop.cereshop.commons.utils.hnapay.JsonUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 描述： + * + * @author stevenhu + * @version 2025/02/18 9:29 + */ +@Service(value = "HnaPayService") +@Slf4j +public class HnaPayServiceImpl implements HnaPayService { + + @Autowired + private CereShopOrderDAO cereShopOrderDAO; + + @Autowired + private CereOrderProductDAO cereOrderProductDAO; + + @Autowired + private CerePlatformBusinessService cerePlatformBusinessService; + + @Autowired + private CerePlatformShopService cerePlatformShopService; + + @Autowired + private CereShopBankDAO cereShopBankDAO; + + @Override + public Map createEntAccount(Long entId, String userName, String mobile, String certNo, String certValidate, String cardNo, String bankCode, String province, String city, String branch) { + String result = ""; + R001TransForm transForm = new R001TransForm(); + transForm.setTranCode("R001"); + transForm.initCommonParams("R001"); + transForm.setSubmitUrl(InitForm.R001_SUBMIT_URL); + transForm.setMerUserId("ent_" + entId); + transForm.setUserName(userName); + transForm.setMobile(mobile); + transForm.setCertType("2"); + transForm.setCertNo(certNo); + transForm.setCertValidate(certValidate); + transForm.setCardNo(cardNo); + transForm.setBankCode(bankCode); + transForm.setProvince(province); + transForm.setCity(city); + transForm.setBranch(branch); + transForm.setNotifyServerUrl(HnaPayConfig.EXAMINE_NOTICE_URL); + try { + result = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(result); + return responseMap; + } + + @Override + public Map uploadEntFile(String userId, String certFileType, String base64) { + String result = ""; + R003TransForm transForm = new R003TransForm(); + transForm.setTranCode("R003"); + transForm.initCommonParams("R003"); + transForm.setSubmitUrl(InitForm.R003_SUBMIT_URL); + transForm.setUserId(userId); + transForm.setCertFileType(certFileType); + transForm.setCertInfo(base64); + try { + result = HttpUtils.commonReq(transForm, true); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(result); + return responseMap; + } + + @Override + public Map modifyEntAccount(String userId, String certNo, String userName, String mobile, String certValidate) { + String result = ""; + R011TransForm transForm = new R011TransForm(); + transForm.setTranCode("R011"); + transForm.initCommonParams("R011"); + transForm.setSubmitUrl(InitForm.R011_SUBMIT_URL); + transForm.setUserId(userId); + transForm.setCertNo(certNo); + transForm.setUserName(userName); + transForm.setMobile(mobile); + transForm.setCertValidate(certValidate); + try { + result = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(result); + return responseMap; + } + + @Override + public Map changeEntCard(String userId, String bindCardAgrNo, String mobile, String cardNo, String bankCode, String province, String city, String branch) { + String result = ""; + R002TransForm transForm = new R002TransForm(); + transForm.setTranCode("R002"); + transForm.initCommonParams("R002"); + transForm.setSubmitUrl(InitForm.R002_SUBMIT_URL); + transForm.setUserId(userId); + transForm.setBindCardAgrNo(bindCardAgrNo); + transForm.setMobile(mobile); + transForm.setCardNo(cardNo); + transForm.setBankCode(bankCode); + transForm.setProvince(province); + transForm.setCity(city); + transForm.setBranch(branch); + try { + result = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(result); + return responseMap; + } + + @Override + public Map refund(String orderFormId, String outTradeNo, String transactionId, String outRefundNo, BigDecimal total, BigDecimal refund) throws CoBusinessException, Exception { + List orderList = null; + String cereOrderFormId = orderFormId; + String[] split = orderFormId.split("-"); + if(!EmptyUtils.isEmpty(split)) { + cereOrderFormId = split[0]; + } + //查询是否为父订单编号 + CereOrderParent parent = cereShopOrderDAO.findByParentFormid(cereOrderFormId); + if (parent != null) { + //查询所有子订单数据 + orderList = cereShopOrderDAO.findByParentId(parent.getParentId()); + + } else { + //子订单支付回调 + orderList = cereShopOrderDAO.findByFormid(cereOrderFormId); + } + //这里理论上只会有一个子订单，如果出现多个说明出错了 + if(orderList.size() != 1){ + throw new CoBusinessException("10000","订单查找出错", ""); + } + + List cereOrderProductList = cereOrderProductDAO.findByOrderIds(orderList.stream().map(CereShopOrder::getOrderId).collect(Collectors.toList())); + log.info("cereOrderProductList:" + new Gson().toJson(cereOrderProductList)); + List shopIdList = orderList.stream().map(CereShopOrder::getShopId).distinct().collect(Collectors.toList()); + List cerePlatformShopList = cerePlatformShopService.getByIdList(shopIdList); + List businessIdList = cerePlatformShopList.stream().map(CerePlatformShop::getBusinessId).distinct().collect(Collectors.toList()); + List cerePlatformBusinessList = cerePlatformBusinessService.getByIdList(businessIdList); + + String resultStr = ""; + T005TransForm transForm = new T005TransForm(); + transForm.setTranCode("T005"); + transForm.initCommonParams("T005"); + transForm.setMerOrderId(outRefundNo); + transForm.setSubmitUrl(InitForm.T005_SUBMIT_URL); + transForm.setSerialId("thee" + System.currentTimeMillis()); + transForm.setOrgMerOrderId(outTradeNo); + //transForm.setOrgSubmitTime(orderInfo.getPaySubmitTime()); + transForm.setOrderAmount(String.valueOf(total)); + transForm.setRefundSource("1"); + transForm.setDestType("1"); + //退款类型 1:全额退款 2：部分退款 + transForm.setRefundType("1"); + transForm.setRefundAmount(String.valueOf(refund)); + transForm.setNotifyUrl(HnaPayConfig.REFUND_NOTICE_URL); + transForm.setRemark("退款备注信息"); + //transForm.setDivideRefundDtl(""); + try { + resultStr = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + //成功 + Map result = new HashMap<>(); + result.put("return_msg", WxPayEnum.REFUND_SUCCESS.getCode()); + result.put("return_code", WxPayEnum.REFUND_OK.getCode()); + return result; + }else { + //失败 + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } + } + + @Override + public Map refundBond(String transactionId, String outRefundNo, BigDecimal total, BigDecimal refund) throws CoBusinessException, Exception { + throw new CoBusinessException("10000","新生通道保证金退款功能待开发", ""); + } + + @Override + public String getMoney(Long businessId, String orderFormid, String tradeType, BigDecimal money) throws CoBusinessException { + BusinessGetAll business = cerePlatformBusinessService.getById(businessId); + CereShopBank shopBank = cereShopBankDAO.selectOne( + Wrappers.lambdaQuery() + .eq(CereShopBank::getShopId, businessId)); + if(shopBank == null){ + throw new CoBusinessException("10000","查找不到绑定的银行卡信息", ""); + } + + String resultStr = ""; + T002TransForm transForm = new T002TransForm(); + transForm.setTranCode("T002"); + transForm.initCommonParams("T002"); + transForm.setSubmitUrl(InitForm.T002_SUBMIT_URL); + transForm.setTranAmount(String.valueOf(money)); + transForm.setUserId(business.getXsPayId()); + transForm.setBindCardAgrNo(shopBank.getCardNumber()); + transForm.setNotifyUrl(HnaPayConfig.GETMONEY_NOTICE_URL); + transForm.setPaymentTerminalInfo(HnaPayConfig.IP); + transForm.setDeviceInfo(HnaPayConfig.IP); + try { + resultStr = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + //成功 + return "success"; + }else { + //失败 + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } + } +} diff --git a/cereshop-app/pom.xml b/cereshop-app/pom.xml index a58890a..935bec5 100644 --- a/cereshop-app/pom.xml +++ b/cereshop-app/pom.xml @@ -79,13 +79,6 @@ 0.2.1 - - - commons-httpclient - commons-httpclient - 3.1 - - diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/service/impl/HnaPayServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/service/impl/HnaPayServiceImpl.java index 66a49ff..35ead70 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/service/impl/HnaPayServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/service/impl/HnaPayServiceImpl.java @@ -1,9 +1,7 @@ package com.shop.cereshop.app.pay.hnapay.service.impl; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.google.gson.Gson; @@ -11,13 +9,7 @@ import com.shop.cereshop.app.dao.business.CerePlatformBusinessDAO; import com.shop.cereshop.app.dao.order.CereOrderProductDAO; import com.shop.cereshop.app.dao.order.CereShopOrderDAO; import com.shop.cereshop.app.pay.hnapay.domain.DivideAcctDtlVo; -import com.shop.cereshop.app.pay.hnapay.request.form.T005TransForm; -import com.shop.cereshop.app.pay.hnapay.request.form.T006TransForm; -import com.shop.cereshop.app.pay.hnapay.request.form.T009TransForm; -import com.shop.cereshop.app.pay.hnapay.request.init.InitForm; import com.shop.cereshop.app.pay.hnapay.service.HnaPayService; -import com.shop.cereshop.app.pay.hnapay.utils.HttpUtils; -import com.shop.cereshop.app.pay.hnapay.utils.JsonUtils; import com.shop.cereshop.app.pay.xs.domain.XsCallBackRequestVo; import com.shop.cereshop.app.pay.xs.utils.CommonUtils; import com.shop.cereshop.app.service.business.CerePlatformBusinessService; @@ -33,8 +25,14 @@ import com.shop.cereshop.commons.domain.order.CereOrderProduct; import com.shop.cereshop.commons.domain.order.CereShopOrder; import com.shop.cereshop.commons.domain.shop.CerePlatformShop; import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.request.hnapay.form.T005TransForm; +import com.shop.cereshop.commons.request.hnapay.form.T006TransForm; +import com.shop.cereshop.commons.request.hnapay.form.T009TransForm; +import com.shop.cereshop.commons.request.hnapay.init.InitForm; import com.shop.cereshop.commons.utils.EmptyUtils; import com.shop.cereshop.commons.utils.StringUtils; +import com.shop.cereshop.commons.utils.hnapay.HttpUtils; +import com.shop.cereshop.commons.utils.hnapay.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -303,7 +301,7 @@ public class HnaPayServiceImpl implements HnaPayService { } } - String result = ""; + String resultStr = ""; T009TransForm transForm = new T009TransForm(); transForm.setTranCode("T009"); transForm.initCommonParams("T009"); @@ -332,11 +330,19 @@ public class HnaPayServiceImpl implements HnaPayService { transForm.setDivideAcctDtl(this.buildSubMerchantOrderDetails(orderList, cereOrderProductList, cerePlatformShopList, cerePlatformBusinessList)); transForm.setFeeAmountUser(""); try { - result = HttpUtils.commonReq(transForm, false); + resultStr = HttpUtils.commonReq(transForm, false); } catch (Exception e) { e.printStackTrace(); } - return null; + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + String qrCodeUrl = String.valueOf(responseMap.get("qrCodeUrl")); + return qrCodeUrl; + }else { + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } } /** diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/controller/HnaPayController.java b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/HnaPayController.java new file mode 100644 index 0000000..d82e662 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/controller/HnaPayController.java @@ -0,0 +1,77 @@ +package com.shop.cereshop.business.controller; + +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.shop.cereshop.business.pay.hnapay.HnaPayService; +import com.shop.cereshop.business.pay.xs.domain.XsCallBackRequestVo; +import com.shop.cereshop.business.service.after.CereOrderAfterService; +import com.shop.cereshop.commons.constant.IntegerEnum; +import com.shop.cereshop.commons.utils.SpringUtil; +import com.shop.cereshop.commons.utils.StringUtils; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 描述：新生支付新账通回调处理 + * + * @author stevenhu + * @version 2025/02/14 9:24 + */ +@RestController +@RequestMapping("extend/hnaPay") +@Slf4j(topic = "hnaPayController") +@Api(value = "新账通模块", tags = "新账通模块") +public class HnaPayController { + + @Autowired + private HnaPayService hnaPayService; + + + /** + * 退款通知回调 + * @throws Exception + */ + @PostMapping("refund/notify") + public String refundNotify(@RequestParam(name = "msg") String msg) throws Exception { + log.info("refundNotify:" + msg); + try { + XsCallBackRequestVo xsCallBackRequestVo = hnaPayService.parseCallBackRequestVo(msg); + log.info(new Gson().toJson(xsCallBackRequestVo)); + String status = xsCallBackRequestVo.getContent().getString("status"); + //2成功 3失败 + if(StringUtils.equals(status, "1")){ + log.info("退款回调成功"); + //截取订单编号 + JSONObject content = xsCallBackRequestVo.getContent(); + String merOrderId = content.getString("merOrderId"); + String oldMerOrderId = content.getString("orgMerOrderId"); + String oldDealId = content.getString("oldDealId"); + CereOrderAfterService afterService = SpringUtil.getBean(CereOrderAfterService.class); + afterService.handleRefundSuc(merOrderId, oldDealId, oldMerOrderId, IntegerEnum.ORDER_PAY_XS.getCode()); +// //处理支付成功后的其他逻辑 +// cereShopOrderService.handleRefundWxLog(orderFormId, dealId, merOrderId); + } + } catch (Exception e) { + e.printStackTrace(); + } + return "success"; + } + + + /** + * 企业上送资料审核结果通知 + * @param msg + * @return + * @throws Exception + */ + @PostMapping("/hnaPay/examine/notify") + public String onExamineNotify(@RequestParam(name = "msg") String msg) { + + return "200"; + } +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/HnaPayService.java b/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/HnaPayService.java new file mode 100644 index 0000000..5e70b15 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/HnaPayService.java @@ -0,0 +1,96 @@ +package com.shop.cereshop.business.pay.hnapay; + + +import com.shop.cereshop.business.pay.PayService; +import com.shop.cereshop.business.pay.xs.domain.XsCallBackRequestVo; +import com.shop.cereshop.commons.exception.CoBusinessException; + +import java.math.BigDecimal; +import java.util.Map; + +/** + * 描述： + * + * @author stevenhu + * @version 2025/02/18 9:27 + */ +public interface HnaPayService extends PayService { + + + /** + * 解析新生支付的回调接口 + * @param msg + * @return + * @throws Exception + */ + XsCallBackRequestVo parseCallBackRequestVo(String msg) throws Exception; + + /** + * 企业开户 + * @param entId 企业id + * @param userName 企业名称 + * @param mobile 企业联系人手机号 + * @param certNo 营业执照号(统一社会信用代码) + * @param certValidate 证件有效期 格式：YYYYMMDD 永久则输入21990101 + * @param cardNo 银行卡号 + * @param bankCode 银行简码 + * @param province 开户行所属省份 + * @param city 开户行所属城市 + * @param branch 开户支行 + * @return + */ + Map createEntAccount(Long entId, String userName, String mobile, String certNo, String certValidate, String cardNo, + String bankCode, String province, String city, String branch); + + + /** + * 企业开户上传资料 + * @param userId 开户返回的userId + * @param certFileType + * 1-身份证正面；（企业必传） + * 2-身份证反面；（企业必传） + * 3-法人身份证手持；（非必传） + * 4-营业执照；（企业必传） + * 5-其他；（非必传） + * 6-其他；（非必传） + * 7-开户许可证；（企业必传） + * @param base64 上传图片base64为 + * @return + */ + Map uploadEntFile(String userId,String certFileType, String base64); + + /** + * 企业开户修改 + * @param userId 开户返回的userId + * @param certNo 营业执照号(统一社会信用代码) + * @param userName 企业名称 + * @param mobile 企业联系人手机号 + * @param certValidate 证件有效期 格式：YYYYMMDD 永久则输入21990101 + * @return + */ + Map modifyEntAccount(String userId, String certNo, String userName, String mobile, String certValidate); + + /** + * 企业换卡 + * @param userId 开户返回的用户编号 + * @param bindCardAgrNo 原绑卡协议号 开户接口返回 + * @param mobile 银行预留手机号 + * @param cardNo 银行卡号 + * @param bankCode 银行简码 + * @param province 开户行所属省份 + * @param city 开户行所属城市 + * @param branch 开户支行 + * @return + */ + Map changeEntCard(String userId, String bindCardAgrNo, String mobile, String cardNo, String bankCode, String province, String city, String branch); + + + /** + * 提现 + * @return + * @throws CoBusinessException + */ + String getMoney(Long businessId, String orderFormid, + String tradeType, BigDecimal money) throws CoBusinessException; + +} diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/impl/HnaPayServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/impl/HnaPayServiceImpl.java new file mode 100644 index 0000000..2b0a574 --- /dev/null +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/pay/hnapay/impl/HnaPayServiceImpl.java @@ -0,0 +1,298 @@ +package com.shop.cereshop.business.pay.hnapay.impl; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.google.gson.Gson; +import com.shop.cereshop.business.dao.order.CereOrderProductDAO; +import com.shop.cereshop.business.dao.order.CereShopOrderDAO; +import com.shop.cereshop.business.dao.shop.CereShopBankDAO; +import com.shop.cereshop.business.page.business.Business; +import com.shop.cereshop.business.page.shop.ShopBankDetail; +import com.shop.cereshop.business.pay.hnapay.HnaPayService; +import com.shop.cereshop.business.pay.xs.domain.XsCallBackRequestVo; +import com.shop.cereshop.business.pay.xs.utils.CommonUtils; +import com.shop.cereshop.business.service.business.CerePlatformBusinessService; +import com.shop.cereshop.business.service.shop.CerePlatformShopService; +import com.shop.cereshop.commons.config.HnaPayConfig; +import com.shop.cereshop.commons.constant.WxPayEnum; +import com.shop.cereshop.commons.domain.business.CerePlatformBusiness; +import com.shop.cereshop.commons.domain.order.CereOrderParent; +import com.shop.cereshop.commons.domain.order.CereOrderProduct; +import com.shop.cereshop.commons.domain.order.CereShopOrder; +import com.shop.cereshop.commons.domain.shop.CerePlatformShop; +import com.shop.cereshop.commons.exception.CoBusinessException; +import com.shop.cereshop.commons.request.hnapay.form.T002TransForm; +import com.shop.cereshop.commons.request.hnapay.form.T005TransForm; +import com.shop.cereshop.commons.request.hnapay.init.InitForm; +import com.shop.cereshop.commons.utils.EmptyUtils; +import com.shop.cereshop.commons.utils.hnapay.HttpUtils; +import com.shop.cereshop.commons.utils.hnapay.JsonUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 描述： + * + * @author stevenhu + * @version 2025/02/18 9:29 + */ +@Service(value = "HnaPayService") +@Slf4j +public class HnaPayServiceImpl implements HnaPayService { + + @Autowired + private CereShopOrderDAO cereShopOrderDAO; + + @Autowired + private CereOrderProductDAO cereOrderProductDAO; + + @Autowired + private CerePlatformBusinessService cerePlatformBusinessService; + + @Autowired + private CerePlatformShopService cerePlatformShopService; + + @Autowired + private CereShopBankDAO cereShopBankDAO; + + @Override + public XsCallBackRequestVo parseCallBackRequestVo(String msg) throws Exception { + //base64 decode + String msgStr = new String(Base64.getDecoder().decode(msg)); + + //LinkedHashMap json字符串转map时保持字段顺序不变 + JSONObject headContentMap = JSONObject.parseObject(msgStr); + + String resSign = headContentMap.getString("sign"); + headContentMap.remove("sign"); + + //headContentMap 转为json字符串时保留字段值为null的字段 + SerializerFeature[] serializerFeatures = new SerializerFeature[]{SerializerFeature.WriteMapNullValue}; + String headContentJson = JSONObject.toJSONString(headContentMap,serializerFeatures); + CommonUtils.verifySignature(headContentJson, resSign); + + JSONObject head = headContentMap.getJSONObject("head"); + JSONObject content = headContentMap.getJSONObject("content"); + + String responseCode = content.getString("responseCode"); + if(StrUtil.isNotBlank(responseCode) && StrUtil.isNotBlank(responseCode) && !StrUtil.equals(responseCode, "0") + && !StrUtil.equals(responseCode, "0000") && !StrUtil.equals(responseCode, "0001")){ + String errorMsg = content.getString("responseDesc"); + throw new CoBusinessException(responseCode, errorMsg); + } + XsCallBackRequestVo xsCallBackRequestVo = new XsCallBackRequestVo(); + xsCallBackRequestVo.setHead(head); + xsCallBackRequestVo.setContent(content); + return xsCallBackRequestVo; + } + + @Override + public Map createEntAccount(Long entId, String userName, String mobile, String certNo, String certValidate, String cardNo, String bankCode, String province, String city, String branch) { + return null; + } + + @Override + public Map uploadEntFile(String userId, String certFileType, String base64) { + return null; + } + + @Override + public Map modifyEntAccount(String userId, String certNo, String userName, String mobile, String certValidate) { + return null; + } + + @Override + public Map changeEntCard(String userId, String bindCardAgrNo, String mobile, String cardNo, String bankCode, String province, String city, String branch) { + return null; + } + + @Override + public Map refund(String orderFormId, String outTradeNo, String transactionId, String outRefundNo, BigDecimal total, BigDecimal refund, Long afterId) throws CoBusinessException, Exception { + List orderList = null; + String cereOrderFormId = orderFormId; + String[] split = orderFormId.split("-"); + if(!EmptyUtils.isEmpty(split)) { + cereOrderFormId = split[0]; + } + //查询是否为父订单编号 + CereOrderParent parent = cereShopOrderDAO.findByParentFormid(cereOrderFormId); + if (parent != null) { + //查询所有子订单数据 + orderList = cereShopOrderDAO.findByParentId(parent.getParentId()); + + } else { + //子订单支付回调 + orderList = cereShopOrderDAO.findByFormid(cereOrderFormId); + } + //这里理论上只会有一个子订单，如果出现多个说明出错了 + if(orderList.size() != 1){ + throw new CoBusinessException("10000","订单查找出错", ""); + } + + List cereOrderProductList = cereOrderProductDAO.findByOrderIds(orderList.stream().map(CereShopOrder::getOrderId).collect(Collectors.toList())); + log.info("cereOrderProductList:" + new Gson().toJson(cereOrderProductList)); + + List shopIdList = orderList.stream().map(CereShopOrder::getShopId).distinct().collect(Collectors.toList()); + List cerePlatformShopList = cerePlatformShopService.getByIdList(shopIdList); + List businessIdList = cerePlatformShopList.stream().map(CerePlatformShop::getBusinessId).distinct().collect(Collectors.toList()); + List cerePlatformBusinessList = cerePlatformBusinessService.getByIdList(businessIdList); + + String resultStr = ""; + T005TransForm transForm = new T005TransForm(); + transForm.setTranCode("T005"); + transForm.initCommonParams("T005"); + transForm.setMerOrderId(outRefundNo); + transForm.setSubmitUrl(InitForm.T005_SUBMIT_URL); + transForm.setSerialId("thee" + System.currentTimeMillis()); + transForm.setOrgMerOrderId(outTradeNo); + //transForm.setOrgSubmitTime(orderInfo.getPaySubmitTime()); + transForm.setOrderAmount(String.valueOf(total)); + transForm.setRefundSource("1"); + transForm.setDestType("1"); + //退款类型 1:全额退款 2：部分退款 + transForm.setRefundType("1"); + transForm.setRefundAmount(String.valueOf(refund)); + transForm.setNotifyUrl(HnaPayConfig.REFUND_NOTICE_URL); + transForm.setRemark("退款备注信息"); + //transForm.setDivideRefundDtl(""); + try { + resultStr = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + //成功 + Map result = new HashMap<>(); + result.put("return_msg", WxPayEnum.REFUND_SUCCESS.getCode()); + result.put("return_code", WxPayEnum.REFUND_OK.getCode()); + return result; + }else { + //失败 + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } + } + + //获取保证金 + @Override + public String getCollectionCode(String orderFormid, BigDecimal money, String ip, String tradeType) throws CoBusinessException, Exception { + return null; + } + + @Override + public Map orderRefund(String orderFormId, String outTradeNo, String transactionId, String outRefundNo, BigDecimal total, BigDecimal refund) throws CoBusinessException, Exception { + List orderList = null; + String cereOrderFormId = orderFormId; + String[] split = orderFormId.split("-"); + if(!EmptyUtils.isEmpty(split)) { + cereOrderFormId = split[0]; + } + //查询是否为父订单编号 + CereOrderParent parent = cereShopOrderDAO.findByParentFormid(cereOrderFormId); + if (parent != null) { + //查询所有子订单数据 + orderList = cereShopOrderDAO.findByParentId(parent.getParentId()); + + } else { + //子订单支付回调 + orderList = cereShopOrderDAO.findByFormid(cereOrderFormId); + } + //这里理论上只会有一个子订单，如果出现多个说明出错了 + if(orderList.size() != 1){ + throw new CoBusinessException("10000","订单查找出错", ""); + } + + List cereOrderProductList = cereOrderProductDAO.findByOrderIds(orderList.stream().map(CereShopOrder::getOrderId).collect(Collectors.toList())); + log.info("cereOrderProductList:" + new Gson().toJson(cereOrderProductList)); + + List shopIdList = orderList.stream().map(CereShopOrder::getShopId).distinct().collect(Collectors.toList()); + List cerePlatformShopList = cerePlatformShopService.getByIdList(shopIdList); + List businessIdList = cerePlatformShopList.stream().map(CerePlatformShop::getBusinessId).distinct().collect(Collectors.toList()); + List cerePlatformBusinessList = cerePlatformBusinessService.getByIdList(businessIdList); + + String resultStr = ""; + T005TransForm transForm = new T005TransForm(); + transForm.setTranCode("T005"); + transForm.initCommonParams("T005"); + transForm.setMerOrderId(outRefundNo); + transForm.setSubmitUrl(InitForm.T005_SUBMIT_URL); + transForm.setSerialId("thee" + System.currentTimeMillis()); + transForm.setOrgMerOrderId(outTradeNo); + //transForm.setOrgSubmitTime(orderInfo.getPaySubmitTime()); + transForm.setOrderAmount(String.valueOf(total)); + transForm.setRefundSource("1"); + transForm.setDestType("1"); + //退款类型 1:全额退款 2：部分退款 + transForm.setRefundType("1"); + transForm.setRefundAmount(String.valueOf(refund)); + transForm.setNotifyUrl(HnaPayConfig.REFUND_NOTICE_URL); + transForm.setRemark("退款备注信息"); + //transForm.setDivideRefundDtl(""); + try { + resultStr = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + //成功 + Map result = new HashMap<>(); + result.put("return_msg", WxPayEnum.REFUND_SUCCESS.getCode()); + result.put("return_code", WxPayEnum.REFUND_OK.getCode()); + return result; + }else { + //失败 + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } + } + + @Override + public String getMoney(Long businessId, String orderFormid, String tradeType, BigDecimal money) throws CoBusinessException { + Business business = cerePlatformBusinessService.getById(businessId); + ShopBankDetail shopBankDetail = cereShopBankDAO.getByShopId(businessId); + if(shopBankDetail == null){ + throw new CoBusinessException("10000","查找不到绑定的银行卡信息", ""); + } + String resultStr = ""; + T002TransForm transForm = new T002TransForm(); + transForm.setTranCode("T002"); + transForm.initCommonParams("T002"); + transForm.setSubmitUrl(InitForm.T002_SUBMIT_URL); + transForm.setTranAmount(String.valueOf(money)); + transForm.setUserId(business.getXsPayId()); + transForm.setBindCardAgrNo(shopBankDetail.getCardNumber()); + transForm.setNotifyUrl(HnaPayConfig.GETMONEY_NOTICE_URL); + transForm.setPaymentTerminalInfo(HnaPayConfig.IP); + transForm.setDeviceInfo(HnaPayConfig.IP); + try { + resultStr = HttpUtils.commonReq(transForm, false); + } catch (Exception e) { + e.printStackTrace(); + } + Map responseMap = JsonUtils.jsonToMap(resultStr); + String resultCode = String.valueOf(responseMap.get("resultCode")); + if (resultCode.equals("0000")){ + //成功 + return "success"; + }else { + //失败 + String errorMsg = String.valueOf(responseMap.get("errorMsg")); + throw new CoBusinessException(errorMsg); + } + } +} diff --git a/cereshop-commons/pom.xml b/cereshop-commons/pom.xml index cbca8cd..066e0a1 100644 --- a/cereshop-commons/pom.xml +++ b/cereshop-commons/pom.xml @@ -28,6 +28,12 @@ + commons-httpclient + commons-httpclient + 3.1 + + + com.baomidou mybatis-plus-extension diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HnaPayConfig.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HnaPayConfig.java index 7dfc84c..245fe31 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HnaPayConfig.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/config/HnaPayConfig.java @@ -57,6 +57,11 @@ public class HnaPayConfig { public static String APP_NOTICE_URL = "http://36.138.125.206/ceres-app-api/extend/hnaPay/pay/notify"; // 退款回调地址 - public static String REFUND_NOTICE_URL = "http://36.138.125.206/ceres-app-api/extend/hnaPay/refund/notify"; + public static String REFUND_NOTICE_URL = "http://36.138.125.206/ceres-business-api/extend/hnaPay/refund/notify"; + + //企业上送资料审核结果通知 + public static String EXAMINE_NOTICE_URL = "http://36.138.125.206/ceres-business-api/extend/hnaPay/examine/notify"; + + public static String GETMONEY_NOTICE_URL = "http://36.138.125.206/ceres-business-api/extend/hnaPay/getmoney/notify"; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/BaseTransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/BaseTransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/BaseTransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/BaseTransForm.java index 2aa3d7e..56891e7 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/BaseTransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/BaseTransForm.java @@ -1,9 +1,9 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import com.alibaba.fastjson.JSONObject; -import com.shop.cereshop.app.pay.hnapay.utils.HnaPayDateUtils; import com.shop.cereshop.commons.config.HnaPayConfig; +import com.shop.cereshop.commons.utils.hnapay.HnaPayDateUtils; import lombok.Data; import java.io.Serializable; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/F001TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/F001TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/F001TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/F001TransForm.java index 2142610..1ec6250 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/F001TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/F001TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q001TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q001TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q001TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q001TransForm.java index a88f5f7..f9aa215 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q001TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q001TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q002TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q002TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q002TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q002TransForm.java index 535d389..130eadd 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q002TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q002TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q003TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q003TransForm.java similarity index 94% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q003TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q003TransForm.java index 2d00933..d1d882f 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q003TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q003TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q004TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q004TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q004TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q004TransForm.java index a7f0ff8..e9960e3 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q004TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q004TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q006TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q006TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q006TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q006TransForm.java index a5a71fe..5145157 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q006TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q006TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q007TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q007TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q007TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q007TransForm.java index c4a1f50..2099e9c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q007TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q007TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q008TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q008TransForm.java similarity index 94% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q008TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q008TransForm.java index c251f23..fb87ad5 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q008TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q008TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q009TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q009TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q009TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q009TransForm.java index 66619b3..aa38ef6 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/Q009TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/Q009TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R001TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R001TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R001TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R001TransForm.java index 5ad5410..584622c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R001TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R001TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R002TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R002TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R002TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R002TransForm.java index e6b7352..7d3f23c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R002TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R002TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R003TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R003TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R003TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R003TransForm.java index 9078e7a..0fdd0d2 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R003TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R003TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R004TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R004TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R004TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R004TransForm.java index f567351..fb3556b 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R004TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R004TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R007TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R007TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R007TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R007TransForm.java index 32f8d38..ac7ba09 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R007TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R007TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R008TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R008TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R008TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R008TransForm.java index 8f4b0ee..5817eb1 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R008TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R008TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R009TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R009TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R009TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R009TransForm.java index cbada1f..b4e6a88 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R009TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R009TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R010TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R010TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R010TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R010TransForm.java index 0da33ec..733b68d 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R010TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R010TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R011TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R011TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R011TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R011TransForm.java index fc0272d..f1eb77d 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R011TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R011TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R012TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R012TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R012TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R012TransForm.java index 7d3689e..cc96320 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R012TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R012TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R013TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R013TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R013TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R013TransForm.java index 85b1135..aed3213 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R013TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R013TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R014TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R014TransForm.java similarity index 94% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R014TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R014TransForm.java index 30a9a38..8afd3a1 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R014TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R014TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R015TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R015TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R015TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R015TransForm.java index 7e6710f..39c3ff1 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/R015TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/R015TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T002TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T002TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T002TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T002TransForm.java index d61f5a4..0a8bfcb 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T002TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T002TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T003TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T003TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T003TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T003TransForm.java index ecbe34d..f993f8c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T003TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T003TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T004TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T004TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T004TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T004TransForm.java index 17e08f6..32ff2de 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T004TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T004TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T005TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T005TransForm.java similarity index 91% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T005TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T005TransForm.java index 56d932f..0cce9fb 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T005TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T005TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; @@ -27,6 +27,7 @@ public class T005TransForm extends BaseTransForm { private String refundAmount;//商户退款金额 private String notifyUrl;//异步通知地址 private String remark;//备注 + private String divideRefundDtl;//担保下单退款明细,担保下单外扣部分退款时必填 @Override public String getEncryptJsonStr() { diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T006TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T006TransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T006TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T006TransForm.java index 16d7b77..41c282a 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T006TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T006TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T007TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T007TransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T007TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T007TransForm.java index 7dce15d..873defc 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T007TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T007TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T008TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T008TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T008TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T008TransForm.java index e5c4407..edd51bf 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T008TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T008TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T009TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T009TransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T009TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T009TransForm.java index b8b6b05..0311b94 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T009TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T009TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T010TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T010TransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T010TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T010TransForm.java index 7c9aca6..f83f69c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T010TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T010TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T011TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T011TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T011TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T011TransForm.java index d77843c..0019146 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T011TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T011TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T012TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T012TransForm.java similarity index 94% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T012TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T012TransForm.java index eabdf38..6a85667 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T012TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T012TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T013TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T013TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T013TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T013TransForm.java index 70c967c..afce924 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T013TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T013TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T019TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T019TransForm.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T019TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T019TransForm.java index 6652209..126ec7e 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T019TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T019TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T020TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T020TransForm.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T020TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T020TransForm.java index c887b6c..7d6e7e8 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T020TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T020TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T021TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T021TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T021TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T021TransForm.java index f60ced2..6bf2e69 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T021TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T021TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T022TransForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T022TransForm.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T022TransForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T022TransForm.java index 7d60982..de22817 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/form/T022TransForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/form/T022TransForm.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.request.form; +package com.shop.cereshop.commons.request.hnapay.form; import lombok.Data; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/init/InitForm.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/init/InitForm.java similarity index 99% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/init/InitForm.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/init/InitForm.java index 25345b5..50b40a3 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/request/init/InitForm.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/request/hnapay/init/InitForm.java @@ -1,7 +1,7 @@ -package com.shop.cereshop.app.pay.hnapay.request.init; +package com.shop.cereshop.commons.request.hnapay.init; -import com.shop.cereshop.app.pay.hnapay.request.form.*; +import com.shop.cereshop.commons.request.hnapay.form.*; import java.util.Map; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/Base64Util.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/Base64Util.java similarity index 95% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/Base64Util.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/Base64Util.java index b162ac2..3b71bff 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/Base64Util.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/Base64Util.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import java.util.Base64; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HexStringByte.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HexStringByte.java similarity index 98% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HexStringByte.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HexStringByte.java index a4bb653..fe2535c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HexStringByte.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HexStringByte.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; /** * 十六进制转换 diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnaPayDateUtils.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnaPayDateUtils.java similarity index 99% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnaPayDateUtils.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnaPayDateUtils.java index 249b7cb..499e496 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnaPayDateUtils.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnaPayDateUtils.java @@ -1,4 +1,4 @@ - package com.shop.cereshop.app.pay.hnapay.utils; + package com.shop.cereshop.commons.utils.hnapay; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnapaySign.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnapaySign.java similarity index 98% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnapaySign.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnapaySign.java index 5d1c462..d989624 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HnapaySign.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HnapaySign.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import com.shop.cereshop.commons.config.HnaPayConfig; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpClientUtils.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpClientUtils.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpClientUtils.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpClientUtils.java index bb579c6..5844a1c 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpClientUtils.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpClientUtils.java @@ -3,10 +3,10 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; - -import com.shop.cereshop.commons.exception.CoBusinessException; +package com.shop.cereshop.commons.utils.hnapay; import org.apache.commons.httpclient.*; +import com.shop.cereshop.commons.exception.CoBusinessException; +import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpUtils.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpUtils.java similarity index 96% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpUtils.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpUtils.java index 9341c58..28f1655 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpUtils.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpUtils.java @@ -1,8 +1,8 @@ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; -import com.shop.cereshop.app.pay.hnapay.request.form.BaseTransForm; -import com.shop.cereshop.app.pay.hnapay.request.init.InitForm; import com.shop.cereshop.commons.config.HnaPayConfig; +import com.shop.cereshop.commons.request.hnapay.form.BaseTransForm; +import com.shop.cereshop.commons.request.hnapay.init.InitForm; import com.shop.cereshop.commons.utils.Base64Util; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpsTransport.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpsTransport.java similarity index 99% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpsTransport.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpsTransport.java index 331875c..adafc8b 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/HttpsTransport.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/HttpsTransport.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import org.apache.commons.lang3.StringUtils; import org.apache.http.*; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/JsonUtils.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/JsonUtils.java similarity index 97% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/JsonUtils.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/JsonUtils.java index bc18f9a..d48a173 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/JsonUtils.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/JsonUtils.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.core.JsonGenerationException; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/KeyUtils.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/KeyUtils.java similarity index 94% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/KeyUtils.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/KeyUtils.java index 84d9fb6..aaeac32 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/KeyUtils.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/KeyUtils.java @@ -1,4 +1,4 @@ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import com.shop.cereshop.commons.config.HnaPayConfig; import com.shop.cereshop.commons.exception.CoBusinessException; diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/RSAAlgorithms.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/RSAAlgorithms.java similarity index 98% rename from cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/RSAAlgorithms.java rename to cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/RSAAlgorithms.java index fdcb405..b543401 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/pay/hnapay/utils/RSAAlgorithms.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/utils/hnapay/RSAAlgorithms.java @@ -3,7 +3,7 @@ * www.hnapay.com */ -package com.shop.cereshop.app.pay.hnapay.utils; +package com.shop.cereshop.commons.utils.hnapay; import com.shop.cereshop.commons.config.HnaPayConfig; import com.shop.cereshop.commons.exception.CoBusinessException;