Browse Source

Merge commit 'refs/tags/jenkins-back-end-350^{}' into release

release_toaliyun_real
hupeng 7 years ago
parent
commit
137aa5d1ae
4 changed files with 51 additions and 54 deletions
  1. +14
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
  2. +1
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +32
    -35
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java
  4. +4
    -7
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java

+ 14
- 10
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -120,11 +120,13 @@ public class WxCouponController extends BaseController {
} }
wxCoupon.setTenantId(getUser().getTenantId()); wxCoupon.setTenantId(getUser().getTenantId());
wxCoupon.setChannels(""); wxCoupon.setChannels("");
if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) {
wxCoupon.setValidStartDate(null);
wxCoupon.setValidEndDate(null);
} else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) {
wxCoupon.setValidDays(null);
if (wxCoupon.getValidType() != null) {
if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) {
wxCoupon.setValidStartDate(null);
wxCoupon.setValidEndDate(null);
} else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) {
wxCoupon.setValidDays(null);
}
} }
Long id = wxCouponService.saveOrUpdate(wxCoupon); Long id = wxCouponService.saveOrUpdate(wxCoupon);
return new ResultData(id); return new ResultData(id);
@@ -150,11 +152,13 @@ public class WxCouponController extends BaseController {
String[] arys = wxCoupon.getBusiness().split(","); String[] arys = wxCoupon.getBusiness().split(",");
wxCoupon.setBusiness(JSON.toJSONString(arys)); wxCoupon.setBusiness(JSON.toJSONString(arys));
} }
if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) {
wxCoupon.setValidStartDate(null);
wxCoupon.setValidEndDate(null);
} else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) {
wxCoupon.setValidDays(null);
if (wxCoupon.getValidType() != null) {
if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) {
wxCoupon.setValidStartDate(null);
wxCoupon.setValidEndDate(null);
} else if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) {
wxCoupon.setValidDays(null);
}
} }
return wxCouponService.updateCoupon(wxCoupon); return wxCouponService.updateCoupon(wxCoupon);
} }


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

@@ -289,8 +289,7 @@ public class WxCoupon implements Serializable {
} }
public String getSalePriceStr() { public String getSalePriceStr() {
if(salePrice!=null) { if(salePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
salePriceStr = df.format((float)salePrice/100);
salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString();
} }
return salePriceStr; return salePriceStr;
} }


+ 32
- 35
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java View File

@@ -5,6 +5,7 @@ import com.iformall.domain.po.WxCoupon;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -364,41 +365,6 @@ public class WxCouponCVo implements Serializable {
public void setBusiness(String _business) { public void setBusiness(String _business) {
business = _business; business = _business;
} }
public String getSalePriceStr() {
if(salePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
salePriceStr = df.format((float)salePrice/100);
}
return salePriceStr;
}

public void setSalePriceStr(String salePriceStr) {
this.salePriceStr = salePriceStr;
}

public String getUsePriceStr() {
if(usePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
usePriceStr = df.format((float)usePrice/100);
}
return usePriceStr;
}

public void setUsePriceStr(String usePriceStr) {
this.usePriceStr = usePriceStr;
}

public String getPriceStr() {
if(price!=null) {
DecimalFormat df=new DecimalFormat("0.00");
priceStr = df.format((float)price/100);
}
return priceStr;
}

public void setPriceStr(String priceStr) {
this.priceStr = priceStr;
}




public String getBuildingName() {return buildingName; } public String getBuildingName() {return buildingName; }
@@ -455,7 +421,38 @@ public class WxCouponCVo implements Serializable {
public void setMerchantStatus(Integer status) { public void setMerchantStatus(Integer status) {
this.merchantStatus = status; this.merchantStatus = status;
} }
public String getSalePriceStr() {
if(salePrice!=null) {
salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString();
}
return salePriceStr;
}

public void setSalePriceStr(String salePriceStr) {
this.salePriceStr = salePriceStr;
}

public String getUsePriceStr() {
if(usePrice!=null) {
usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString();
}
return usePriceStr;
}

public void setUsePriceStr(String usePriceStr) {
this.usePriceStr = usePriceStr;
}

public String getPriceStr() {
if(price!=null) {
priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString();
}
return priceStr;
}


public void setPriceStr(String priceStr) {
this.priceStr = priceStr;
}


public static enum Field public static enum Field
{ {


+ 4
- 7
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java View File

@@ -6,6 +6,7 @@ import com.iformall.domain.po.WxMerchant;


import javax.persistence.Transient; import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;


/** /**
@@ -165,8 +166,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {


public String getSalePriceStr() { public String getSalePriceStr() {
if(salePrice!=null) { if(salePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
salePriceStr = df.format((float)salePrice/100);
salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString();
} }
return salePriceStr; return salePriceStr;
} }
@@ -177,8 +177,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {


public String getUsePriceStr() { public String getUsePriceStr() {
if(usePrice!=null) { if(usePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
usePriceStr = df.format((float)usePrice/100);
usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString();
} }
return usePriceStr; return usePriceStr;
} }
@@ -187,11 +186,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
this.usePriceStr = usePriceStr; this.usePriceStr = usePriceStr;
} }



public String getPriceStr() { public String getPriceStr() {
if(price!=null) { if(price!=null) {
DecimalFormat df=new DecimalFormat("0.00");
priceStr = df.format((float)price/100);
priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString();
} }
return priceStr; return priceStr;
} }


Loading…
Cancel
Save