Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java

@@ -65,6 +65,21 @@
   @Override

   public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException {

      isCouponTemplateRight(template);

      ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid);

      if (old != null) {

         ShareGoodsTextTemplate update = new ShareGoodsTextTemplate();

         update.setId(old.getId());

         update.setShareCouponTextTemplate(template);

         update.setUpdateTime(new Date());

         shareGoodsTextTemplateMapper.updateByPrimaryKeySelective(update);

      } else {

         ShareGoodsTextTemplate textTemplate = new ShareGoodsTextTemplate();

         textTemplate.setCreateTime(new Date());

         textTemplate.setShareCouponTextTemplate(template);

         textTemplate.setUid(uid);

         shareGoodsTextTemplateMapper.insertSelective(textTemplate);

      }

		
   }



   @Override