Merge remote-tracking branch 'origin/div' into div

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

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

@@ -115,7 +115,7 @@
               OrderTeamReward update = new OrderTeamReward(subsidy.getId());

               update.setState(OrderTeamReward.STATE_INVALID);

               update.setUpdateTime(new Date());



               update.setInValidTime(new Date());

               orderTeamRewardMapper.updateByPrimaryKeySelective(update);

            }

         }

@@ -132,6 +132,7 @@
               update.setState(OrderTeamReward.STATE_VALID);

               update.setUpdateTime(new Date());

               update.setPreGetTime(preGetTime);

               update.setValidTime(new Date());

               orderTeamRewardMapper.updateByPrimaryKeySelective(update);

            }

         }