Kaynağa Gözat

Merge tag 'refs/tags/jenkins-back-end-1169' into release

develop
release_toaliyun_real
Stormeye Wu 7 yıl önce
ebeveyn
işleme
4655f4fb12
2 değiştirilmiş dosya ile 5 ekleme ve 7 silme
  1. +4
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java

+ 4
- 6
mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java Dosyayı Görüntüle

@@ -96,13 +96,11 @@ public class WxCampaignController extends BaseController {
@PostMapping("updateStatus") @PostMapping("updateStatus")
public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) {
logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus");
if(wxCampaign.getType() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "type不能为空");
}
WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId());
// check coupon 状态 // check coupon 状态
if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) {
if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) {
List<String> ids = JSONArray.parseArray(wxCampaign.getCouponIds(), String.class);
if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) {
if (campaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) {
List<String> ids = JSONArray.parseArray(campaign.getCouponIds(), String.class);
for (String couponIdStr : ids) { for (String couponIdStr : ids) {
Long couponId = Long.parseLong(couponIdStr); Long couponId = Long.parseLong(couponIdStr);




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java Dosyayı Görüntüle

@@ -181,7 +181,7 @@ public class WxCampaignServiceImpl implements WxCampaignService {


WxCoupon wxCoupon = wxCouponService.getById(couponId); WxCoupon wxCoupon = wxCouponService.getById(couponId);
if (wxCoupon == null) { if (wxCoupon == null) {
throw new MallinkException(ErrorCode.COUPON_IS_EMPTY);
return;
} }
if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) { if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) {
return; return;


Yükleniyor…
İptal
Kaydet