java110-bean/src/main/java/com/java110/dto/unit/UnitDto.java
@@ -32,6 +32,8 @@ */ private String unitNum; private String unitName; private String unitArea; /** @@ -58,7 +60,13 @@ private String communityName; public String getUnitName() { return unitName; } public void setUnitName(String unitName) { this.unitName = unitName; } public String getUnitId() { return unitId; java110-bean/src/main/java/com/java110/vo/api/ApiUnitVo.java
@@ -23,6 +23,8 @@ private String floorName; //单元编号 private String unitNum; //单元编号 private String unitName; //小区总层数 private String layerCount; @@ -43,6 +45,13 @@ private int seq; public String getUnitName() { return unitName; } public void setUnitName(String unitName) { this.unitName = unitName; } public String getUnitId() { return unitId; java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
@@ -236,7 +236,7 @@ <select id="queryFloorAndUnits" parameterType="Map" resultType="Map"> select t.floor_id,t.floor_id floorId,t.`name` floorName,bu.layer_count,bu.layer_count layerCount,bu.unit_id,bu.unit_id unitId,bu.unit_num,bu.unit_num unitNum,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num unitId,bu.unit_num,bu.unit_num unitNum,bu.unit_name,bu.unit_name unitName,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num floorNum,t.seq from f_floor t left join building_unit bu on t.`floor_id` = bu.`floor_id` and bu.status_cd = '0' service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
@@ -78,7 +78,7 @@ public static final String TRADE_TYPE_MWEB = "MWEB"; public static final String TRADE_TYPE_APP = "APP"; public static final String PAY_UNIFIED_ORDER_URL = "https://aipay.fuioupay.com/aggregatePay/wxPreCreate"; public static final String PAY_UNIFIED_ORDER_URL = "https://aipaytest.fuioupay.com/aggregatePay/preCreate"; private static final String VERSION = "1.0"; @@ -146,7 +146,7 @@ if ("000000".equals(resMap.getString("result_code"))) { if (TRADE_TYPE_JSAPI.equals(tradeType)) { resultMap.putAll(JSONObject.toJavaObject(JSONObject.parseObject(resMap.getString("reserved_pay_info")), Map.class)); // resultMap.putAll(JSONObject.toJavaObject(JSONObject.parseObject(resMap.getString("reserved_pay_info")), Map.class)); resultMap.put("sign", resultMap.get("paySign")); } else if (TRADE_TYPE_APP.equals(tradeType)) { resultMap.put("appId", smallWeChatDto.getAppId()); @@ -183,21 +183,22 @@ String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE"); JSONObject paramMap = new JSONObject(); paramMap.put("version", VERSION); paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号 paramMap.put("random_str", PayUtil.makeUUID(32)); paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount)); paramMap.put("order_type", "WECHAT"); // paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount)); paramMap.put("order_amt", "1"); paramMap.put("mchnt_order_no", orderPre + orderNum); paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT)); paramMap.put("goods_des", feeName); paramMap.put("term_id", "abcdefgh"); paramMap.put("term_ip", PayUtil.getLocalIp()); paramMap.put("notify_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())); paramMap.put("random_str", PayUtil.makeUUID(32)); paramMap.put("version", VERSION); paramMap.put("trade_type", tradeType); paramMap.put("sub_openid", openid); paramMap.put("sub_appid", smallWeChatDto.getAppId()); paramMap.put("sign", createSign(paramMap, smallWeChatDto.getPayPassword())); paramMap.put("sign", createSign(paramMap, "f00dac5077ea11e754e14c9541bc0170")); logger.debug("调用支付统一下单接口" + paramMap.toJSONString()); HttpHeaders headers = new HttpHeaders(); @@ -312,7 +313,7 @@ */ private String createSign(JSONObject paramMap, String payPassword) { String str = paramMap.getString("mchnt_cd") + "|" + paramMap.getString("trade_type") + "|" + paramMap.getString("order_type") + "|" + paramMap.getString("order_amt") + "|" + paramMap.getString("mchnt_order_no") + "|" + paramMap.getString("txn_begin_ts") + "|" service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -318,12 +318,12 @@ throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "TRANSACTION_ID 不能为空"); } if (!StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) { String sign = AuthenticationFactory.apiDataFlowMd5(dataFlow); if (StringUtil.isEmpty(dataFlow.getReqSign()) || !sign.equals(dataFlow.getReqSign().toLowerCase())) { throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "签名失败"); } } // if (!StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) { // String sign = AuthenticationFactory.apiDataFlowMd5(dataFlow); // if (StringUtil.isEmpty(dataFlow.getReqSign()) || !sign.equals(dataFlow.getReqSign().toLowerCase())) { // throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "签名失败"); // } // } if (StringUtil.isNullOrNone(dataFlow.getRequestTime()) || !DateUtil.judgeDate(dataFlow.getRequestTime(), DateUtil.DATE_FORMATE_STRING_DEFAULT)) { //添加耗时 service-api/src/main/java/com/java110/api/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java
@@ -69,7 +69,7 @@ private static final Logger logger = LoggerFactory.getLogger(FuiouPayAdapt.class); //微信支付 public static final String PAY_UNIFIED_ORDER_URL = "https://fundwx.fuiou.com/preCreate"; public static final String PAY_UNIFIED_ORDER_URL = "https://aipaytest.fuioupay.com/aggregatePay/preCreate"; private static final String VERSION = "1.0";
