Bläddra i källkod

return fee comment

java110 3 år sedan
förälder
incheckning
96bdf72867

+ 13 - 3
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeIcbcPaymentAdapt.java.txt

@@ -16,6 +16,7 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.PayUtil;
@@ -60,7 +61,8 @@ public class QrCodeIcbcPaymentAdapt implements IQrCodePaymentSMO {
         logger.info("【工商银行支付】 统一下单开始, 订单编号=" + orderNum);
         SortedMap<String, String> resultMap = new TreeMap<String, String>();
         //生成支付金额,开发环境处理支付金额数到0.01、0.02、0.03元
-        double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), money);
+        // double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), money);
+         double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
         //添加或更新支付记录(参数跟进自己业务需求添加)
 
         String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
@@ -73,9 +75,17 @@ public class QrCodeIcbcPaymentAdapt implements IQrCodePaymentSMO {
         String appName = CommunitySettingFactory.getValue(communityId, "ICBC_APP_NAME");
         String icbcAppId = CommunitySettingFactory.getValue(communityId, "ICBC_APP_ID");
 
+        //System.out.println("appId=" + appId);
+        System.out.println("privateKey=" + privateKey);
+        System.out.println("apiPublicKey=" + apiPublicKey);
+        System.out.println("merId=" + merId);
+        System.out.println("merPrtclNo=" + merPrtclNo);
+        System.out.println("deciveInfo=" + deciveInfo);
+        System.out.println("appName=" + appName);
+        System.out.println("icbcAppId=" + icbcAppId);
 
         //签名类型为RSA2时,需传入appid,私钥和网关公钥,签名类型使用定值IcbcConstants.SIGN_TYPE_RSA2,其他参数使用缺省值
-        DefaultIcbcClient client = new DefaultIcbcClient(icbcAppId, IcbcConstants.SIGN_TYPE_RSA, privateKey, apiPublicKey);
+        DefaultIcbcClient client = new DefaultIcbcClient(icbcAppId, IcbcConstants.SIGN_TYPE_RSA2, privateKey, apiPublicKey);
         MybankPayQrcodeScannedPayRequestV5 request = new MybankPayQrcodeScannedPayRequestV5();
         //4、根据测试环境和生产环境替换相应ip和端口
         request.setServiceUrl("https://gw.open.icbc.com.cn/api/mybank/pay/qrcode/scanned/pay/V5");
@@ -87,7 +97,7 @@ public class QrCodeIcbcPaymentAdapt implements IQrCodePaymentSMO {
         bizContent.setTradeDate(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H)); //交易日期  格式:YYYYMMDD
         bizContent.setTradeTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_N)); //交易时间hhmmss
         //bizContent.setAttach("1231"); //商户附加信息
-        bizContent.setOrderAmt(payAmount + ""); //交易金额
+        bizContent.setOrderAmt(PayUtil.moneyToIntegerStr(payAmount)); //交易金额
         //bizContent.setSubAppId("wxfb72f1a7d061d631"); //子商户应用号
         //bizContent.setGoodsTag("DP");  //优惠标志
 //        JSONArray goodsDetailArray = new JSONArray();

+ 1 - 0
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/UpdateReturnPayFeeCmd.java

@@ -455,6 +455,7 @@ public class UpdateReturnPayFeeCmd extends Cmd {
 
     /**
      * 发起退款
+     * 这里发起退款后 通过databus 触发 ReturnPayFeeMoneyAdapt 这个类 退款
      *
      * @param feeDetailDto
      */