Merge branch 'div' into div-1

yujian

2020-03-28 393e3a365b5ebbed6e9eef07fbd18881cde73711

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java

@@ -223,6 +223,7 @@
               InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());

               update.setState(InviteOrderSubsidy.STATE_INVALID);

               update.setUpdateTime(new Date());

               update.setInValidTime(new Date());

               inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

            }

         }

@@ -239,6 +240,7 @@
               InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());

               update.setState(InviteOrderSubsidy.STATE_VALID);

               update.setUpdateTime(new Date());

               update.setValidTime(new Date());

               inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

            }

         }