Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java

@@ -53,8 +53,8 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
         //更新数据库默认值
         cardManagementInfo = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
         //二维码
-        String str = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
-        String str1 = qrCodeUtil.getQRCodeImage("http://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
+        String str = qrCodeUtil.getQRCodeImage("https://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
+        String str1 = qrCodeUtil.getQRCodeImage("https://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo.getName(), GeneratorUtil.genUUId());
         cardManagementInfo.setQrCode(str);
         cardManagementInfo.setQrCodeMyself(str1);
         return cardManagementInfoMapper.updateById(cardManagementInfo) > 0;
@@ -167,6 +167,12 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
     public Boolean update(CardManagementInfo cardManagementInfo) throws ServiceException {
         Date now = new Date();
         cardManagementInfo.setGmtUpdate(now);
+        CardManagementInfo cardManagementInfo1 = cardManagementInfoMapper.selectById(cardManagementInfo.getId());
+        //二维码
+        String str = qrCodeUtil.getQRCodeImage("https://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId(), false, cardManagementInfo1.getName(), GeneratorUtil.genUUId());
+        String str1 = qrCodeUtil.getQRCodeImage("https://liangxin.zthymaoyi.com/id="+cardManagementInfo.getId() + "," + cardManagementInfo.getCommonId(), false, cardManagementInfo1.getName(), GeneratorUtil.genUUId());
+        cardManagementInfo.setQrCode(str);
+        cardManagementInfo.setQrCodeMyself(str1);
         return cardManagementInfoMapper.updateById(cardManagementInfo) > 0;
     }