[营销分析][添加][卡营销列表]

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java

@@ -172,9 +172,6 @@ public class WxCouponController extends BaseController {
             if(coupon.getSumSubsidy() == null){
                 coupon.setSumSubsidy(0);
             }
-            if(coupon.getSumSubsidy() == null){
-                coupon.setSumSubsidy(0);
-            }
         }
         return new ResultData(pageInfo);
     }

mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

@@ -256,7 +256,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
                         || !record.getLease().equals(dbRent.getLease())
                         || !record.getType().equals(dbRent.getType())
                         || !record.getPrice().equals(dbRent.getPrice())
-                        || !record.getAdjustRatio().equals(dbRent.getAdjustRatio())
+                        || !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*",""))
                         ) {
                     change = true;
                 }