Commit e2486ecf authored by shiyu's avatar shiyu

发布的商品不符合规定就取消签到记录3

parent a292fa28
...@@ -55,7 +55,10 @@ public class SignDateRecord implements Entity { ...@@ -55,7 +55,10 @@ public class SignDateRecord implements Entity {
*/ */
private Integer dateState; private Integer dateState;
/**
* 签到赠送的商品信息
*/
private SupplierItemVo supplierItemVo;
} }
...@@ -53,7 +53,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer { ...@@ -53,7 +53,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
"/wx/exchange/findExchangeItem", "/wx/specialPerformance/findInfos", "/wx/specialPerformance/findItemList", "/wx/exchange/findExchangeItem", "/wx/specialPerformance/findInfos", "/wx/specialPerformance/findItemList",
"/wx/groupPurchase/findList", "/wx/groupPurchase/findItemDetail", "/wx/exchangeApplyOrder/handleApplyOrder", "/wx/supplierItem/findDiscountList", "/wx/groupPurchase/findList", "/wx/groupPurchase/findItemDetail", "/wx/exchangeApplyOrder/handleApplyOrder", "/wx/supplierItem/findDiscountList",
"/wx/storage/uploadVideo", "/wx/storage/uploadVideo",
"/wx/appletPageConfig/**", "/wx/blindBox/**","/wx/sellActivity/**","/wx/itemTagQrCode/createQrCode" "/wx/appletPageConfig/**", "/wx/blindBox/**","/wx/sellActivity/**","/wx/itemTagQrCode/createQrCode","/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord"
//下列路径上线注释 //下列路径上线注释
//"/wx/itemTagQrCode/**" //"/wx/itemTagQrCode/**"
// ,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**" // ,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**"
......
...@@ -319,6 +319,7 @@ public class UserSigninServiceImpl implements UserSigninService { ...@@ -319,6 +319,7 @@ public class UserSigninServiceImpl implements UserSigninService {
supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice())); supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos())); supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
signInRewardVo.setSupplierItemVo(supplierItemVo); signInRewardVo.setSupplierItemVo(supplierItemVo);
signDateRecord.setSupplierItemVo(supplierItemVo);
signInRewardVos.add(signInRewardVo); signInRewardVos.add(signInRewardVo);
} else if (signDateMap.get(dateStr).getConsecutiveDays() == 14) { } else if (signDateMap.get(dateStr).getConsecutiveDays() == 14) {
SignInRewardVo signInRewardVo = new SignInRewardVo(); SignInRewardVo signInRewardVo = new SignInRewardVo();
...@@ -334,6 +335,7 @@ public class UserSigninServiceImpl implements UserSigninService { ...@@ -334,6 +335,7 @@ public class UserSigninServiceImpl implements UserSigninService {
supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice())); supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos())); supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
signInRewardVo.setSupplierItemVo(supplierItemVo); signInRewardVo.setSupplierItemVo(supplierItemVo);
signDateRecord.setSupplierItemVo(supplierItemVo);
signInRewardVos.add(signInRewardVo); signInRewardVos.add(signInRewardVo);
} else if (signDateMap.get(dateStr).getConsecutiveDays() == 21) { } else if (signDateMap.get(dateStr).getConsecutiveDays() == 21) {
SignInRewardVo signInRewardVo = new SignInRewardVo(); SignInRewardVo signInRewardVo = new SignInRewardVo();
...@@ -349,6 +351,7 @@ public class UserSigninServiceImpl implements UserSigninService { ...@@ -349,6 +351,7 @@ public class UserSigninServiceImpl implements UserSigninService {
supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice())); supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos())); supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
signInRewardVo.setSupplierItemVo(supplierItemVo); signInRewardVo.setSupplierItemVo(supplierItemVo);
signDateRecord.setSupplierItemVo(supplierItemVo);
signInRewardVos.add(signInRewardVo); signInRewardVos.add(signInRewardVo);
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment