Преглед изворни кода

Merge branch 'release_real_202103' of https://git.malls.iformall.com/server/formallProject into release_real_202103

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
7ecc16de57
3 измењених фајлова са 24 додато и 4 уклоњено
  1. +12
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java
  3. +10
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java

+ 12
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java Прегледај датотеку

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCUserCar;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxPark; import com.iformall.domain.po.WxPark;
import com.iformall.domain.vo.WxCouponOrderCarCVo; import com.iformall.domain.vo.WxCouponOrderCarCVo;
@@ -39,6 +40,15 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic
@Override @Override
public String initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) throws Exception{ public String initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) throws Exception{
String carNumber = paramMap.get("carNumber");
if (StringUtils.isBlank(carNumber)) {
logger.error("carNumber为空");
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空");
}
WxCUserCar car = parkHelper.getOne(park, member.getId(), carNumber, EnumCarVendor.CAE_CYF);
if (null != car) {
return car.getVendorPersonId();
}
return null; return null;
} }
@@ -122,10 +132,11 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic
if (retObj.getIntValue("result") == 1){ if (retObj.getIntValue("result") == 1){
Integer createTime = retObj.getInteger("inTime");//计费时间 Integer createTime = retObj.getInteger("inTime");//计费时间
Integer endTime = retObj.getInteger("endTime");//离场时间 Integer endTime = retObj.getInteger("endTime");//离场时间
String msg = retObj.getString("warmPrompt");
String appId = ""; String appId = "";
String payPath = ""; String payPath = "";
return new ResultData(new ParkStopFee(retObj.getString("orderId"), cyf.utcToLocal(String.valueOf(createTime)), return new ResultData(new ParkStopFee(retObj.getString("orderId"), cyf.utcToLocal(String.valueOf(createTime)),
cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null,null));
cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null,msg));
}else { }else {
logger.error("cyfCarStopFee error. paramMap: {} . cyfResult: {}",JSON.toJSONString(paramMap),ret); logger.error("cyfCarStopFee error. paramMap: {} . cyfResult: {}",JSON.toJSONString(paramMap),ret);
String msg = retObj.getString("strError"); String msg = retObj.getString("strError");


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java Прегледај датотеку

@@ -116,7 +116,7 @@ public class CYFUtil {
**/ **/
public String getCarStopFee(String token,String parkingId,String plates){ public String getCarStopFee(String token,String parkingId,String plates){
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("token ",token);
paramMap.put("token",token);
paramMap.put("parkingId",Integer.valueOf(parkingId)); paramMap.put("parkingId",Integer.valueOf(parkingId));
paramMap.put("plate",plates); paramMap.put("plate",plates);
paramMap.put("carOutTime",0); paramMap.put("carOutTime",0);
@@ -133,7 +133,7 @@ public class CYFUtil {
*/ */
public String unbindCar(String token,String parkingId,String vendorPersonId) { public String unbindCar(String token,String parkingId,String vendorPersonId) {
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("token ",token);
paramMap.put("token",token);
paramMap.put("parkingId",Integer.valueOf(parkingId)); paramMap.put("parkingId",Integer.valueOf(parkingId));
paramMap.put("personId",Integer.valueOf(vendorPersonId)); paramMap.put("personId",Integer.valueOf(vendorPersonId));
String result = Proc(UNBIND_CAR, paramMap); String result = Proc(UNBIND_CAR, paramMap);


+ 10
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java Прегледај датотеку

@@ -40,6 +40,15 @@ public class ParkHelper {
@Autowired @Autowired
WxCreditHistoryService wxCreditHistoryService; WxCreditHistoryService wxCreditHistoryService;
public WxCUserCar getOne(WxPark park, Long cuUserId,String carNumber,EnumCarVendor carVendor) {
WxCUserCar userCar = new WxCUserCar();
userCar.updateTenantInfo(park);
userCar.setCUserId(cuUserId);
userCar.setCarNumber(carNumber);
userCar.setVendorType(carVendor.getCode());
return wxCUserCarService.getOne(userCar);
}
public ResultData bindCar(Map<String, String> paramMap, WxPark park, Long cuUserId,String vendorPersonId) { public ResultData bindCar(Map<String, String> paramMap, WxPark park, Long cuUserId,String vendorPersonId) {
String carNumber = paramMap.get("carNumber"); String carNumber = paramMap.get("carNumber");
if (StringUtils.isBlank(carNumber)) { if (StringUtils.isBlank(carNumber)) {
@@ -53,7 +62,7 @@ public class ParkHelper {
} catch (Exception e) { } catch (Exception e) {
return new ResultData(500, e.getMessage()); return new ResultData(500, e.getMessage());
} }
return new ResultData();
return new ResultData(vendorPersonId);
} }
public void addCarInfoToDB(String carNumber, EnumCarVendor carVendor, WxPark park, Long cuUserId,String vendorPersonId) { public void addCarInfoToDB(String carNumber, EnumCarVendor carVendor, WxPark park, Long cuUserId,String vendorPersonId) {


Loading…
Откажи
Сачувај