Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
d5c22dbfe6
4 changed files with 14 additions and 3 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java
  3. +10
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java View File

@@ -144,7 +144,7 @@ public class WxCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="原价(适用于类型10)",name="origPrice")
private Integer origPrice;

@io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时*100)",name="unit")
@io.swagger.annotations.ApiModelProperty(value="单位EnumCouponUnit(0:rmb分 1:小时*100)",name="unit")
private Integer unit;
@io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory")
private Integer remainInventory;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java View File

@@ -210,7 +210,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
String couponStart = dateToISO8601Time(coupon.getValidStartDate());
String couponEnd = dateToISO8601Time(coupon.getValidEndDate());
JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode,couponStart,couponEnd);
JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode,couponStart,couponEnd,coupon);
RedisCacheUtils.cache(redisTemplate, "carStop:haikangv2StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode, 1, 24*3600);
return new ResultData();


+ 10
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java View File

@@ -7,7 +7,9 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import com.hikvision.artemis.sdk.constant.Constants;
import com.iformall.common.ErrorCode;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxPark;
import com.iformall.enums.EnumCouponUnit;
import com.iformall.exception.MallinkException;
import com.iformall.utils.DateUtils;

@@ -145,7 +147,7 @@ public class HaiKangWeiShiV3Util {
/**
* 使用优惠券
**/
public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode,String start,String end){
public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode,String start,String end,WxCoupon coupon){
String vendroParams = wxPark.getVendorParams();
JSONObject vp = JSON.parseObject(vendroParams);
@@ -158,6 +160,13 @@ public class HaiKangWeiShiV3Util {
ob.put("couponCode", couponCode);
ob.put("plateNo", carNumber);
ob.put("parkSyscode", wxPark.getParkingId());
if (coupon.getUnit().intValue() == EnumCouponUnit.MONEY.getCode().intValue()) {
ob.put("deductRuleType", 0);
ob.put("deductContent", new BigDecimal(coupon.getPrice()).divide(new BigDecimal(100)).intValue());
}else {
ob.put("deductRuleType", 4);
ob.put("deductContent", new BigDecimal(coupon.getPrice()).divide(new BigDecimal(100)).multiply(new BigDecimal(60)).intValue());
}
ob.put("startTime", start);
ob.put("endTime", end);
array.add(ob);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java View File

@@ -39,6 +39,8 @@ import java.util.Map;
*
* http://ap.jieshun.cn:9088/apply 18600671341/iformall2020
*
* 捷顺商户平台https://b.jparking.cn/
*
*
* 捷顺参数:
* loginurl=http://syx.jslife.com.cn/jsaims/login


Loading…
Cancel
Save