优化代码

service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java

@@ -7,7 +7,6 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.CallApiServiceFactory;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.WechatConstant;
@@ -35,7 +34,7 @@ public class CheckPayFinishCmd extends AbstractServiceCmdListener {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-        String orderId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId);
+        String orderId = reqJson.getString("orderId");
         double receivedAmount = Double.parseDouble(reqJson.getString("receivedAmount"));
         String authCode = reqJson.getString("authCode");
         if (StringUtil.isEmpty(authCode) || authCode.length() < 2) {
@@ -66,8 +65,8 @@ public class CheckPayFinishCmd extends AbstractServiceCmdListener {
         }
         String appId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.APP_ID);
         String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
-        String paramOut = CallApiServiceFactory.postForApi(appId, reqJson.toJSONString(), "fee.payFee", String.class, userId);
-        cmdDataFlowContext.setResponseEntity(new ResponseEntity(paramOut, HttpStatus.OK));
+        JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, "fee.payFee", JSONObject.class, userId);
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(paramOut));
     }
 
 }

service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java

@@ -8,6 +8,9 @@ import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.CallApiServiceFactory;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.WechatConstant;
@@ -17,9 +20,9 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * 扫码付
@@ -28,6 +31,9 @@ import org.springframework.http.ResponseEntity;
 public class QrCodePaymentCmd extends AbstractServiceCmdListener {
     private static Logger logger = LoggerFactory.getLogger(QrCodePaymentCmd.class);
 
+    @Autowired
+    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+
 
     private IQrCodePaymentSMO qrCodePaymentSMOImpl;
 
@@ -47,20 +53,28 @@ public class QrCodePaymentCmd extends AbstractServiceCmdListener {
 
         String payQrAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_QR_ADAPT);
 
-        if(StringUtil.isEmpty(payQrAdapt)) {
+        if (StringUtil.isEmpty(payQrAdapt)) {
             int pre = Integer.parseInt(authCode.substring(0, 2));
             if (pre > 24 && pre < 31) { // 支付宝
                 qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
             } else {
                 qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
             }
-        }else{
+        } else {
             qrCodePaymentSMOImpl = ApplicationContextFactory.getBean(payQrAdapt, IQrCodePaymentSMO.class);
         }
 
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(reqJson.getString("communityId"));
+        List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
+
+        Assert.listOnlyOne(communityDtos, "小区不存在");
+
+        String feeName = communityDtos.get(0).getName() + "-" + reqJson.getString("payerObjName") + "-" + reqJson.getString("feeName");
+
         ResultVo resultVo = null;
         try {
-            resultVo = qrCodePaymentSMOImpl.pay(reqJson.getString("communityId"), orderId, receivedAmount, authCode, "");
+            resultVo = qrCodePaymentSMOImpl.pay(reqJson.getString("communityId"), orderId, receivedAmount, authCode, feeName);
         } catch (Exception e) {
             logger.error("异常了", e);
             cmdDataFlowContext.setResponseEntity(ResultVo.error(e.getLocalizedMessage()));

service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java

@@ -99,7 +99,11 @@ public class QrCodeAliPaymentAdapt implements IQrCodePaymentSMO {
 
     @Override
     public ResultVo checkPayFinish(String communityId, String orderNum) {
-        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", "app_id", "your private_key", "json", "GBK", "alipay_public_key", "RSA2");
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+                CommunitySettingFactory.getValue(communityId, "APP_ID"),
+                CommunitySettingFactory.getRemark(communityId, "APP_PRIVATE_KEY"),
+                "json", "UTF-8",
+                CommunitySettingFactory.getRemark(communityId, "ALIPAY_PUBLIC_KEY"), "RSA2");
         AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
         request.setBizContent("{" +
                 "  \"out_trade_no\":\"" + orderNum + "\"," +

service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java

@@ -78,7 +78,7 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
         paramMap.put("appid", shopSmallWeChatDto.getAppId());
         paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
         paramMap.put("nonce_str", PayUtil.makeUUID(32));
-        paramMap.put("body", systemName + feeName);
+        paramMap.put("body", feeName);
         paramMap.put("out_trade_no", orderNum);
         paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
         paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
@@ -111,7 +111,7 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
         if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
             return new ResultVo(ResultVo.CODE_OK, "成功");
         } else {
-            return new ResultVo(ResultVo.CODE_ERROR, resMap.get("msg"));
+            return new ResultVo(ResultVo.CODE_ERROR, resMap.get("err_code_des"));
         }
     }
 
@@ -135,10 +135,15 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
 
             SortedMap<String, String> paramMap = new TreeMap<String, String>();
             paramMap.put("appid", shopSmallWeChatDto.getAppId());
-            paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
+            paramMap.put("sub_mch_id", shopSmallWeChatDto.getMchId());
             paramMap.put("nonce_str", PayUtil.makeUUID(32));
             paramMap.put("out_trade_no", orderNum);
-            paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
+            String paySwitch = MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_PAY_SWITCH);
+            if (WECHAT_SERVICE_PAY_SWITCH_ON.equals(paySwitch)) {
+                paramMap.put("appid", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_APP_ID));  //服务商appid，是服务商注册时公众号的id
+                paramMap.put("mch_id", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_MCH_ID));  //服务商商户
+            }
+            paramMap.put("sign", PayUtil.createSign(paramMap, shopSmallWeChatDto.getPayPassword()));
 //转换为xml
             String xmlData = PayUtil.mapToXml(paramMap);