Merge branch 'fixbug/updateTime' into 'master'

bug: [none] 解决更新素材时，创建时间及更新时间的问题

See merge request rays/pcloud-book!863

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -1063,14 +1063,17 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
             groupNewsMaterialAddDTO.setGroupName(materialDTO.getGroupName());
             groupNewsMaterialAddDTO.setQrcodeUrl(materialDTO.getQrcodeUrl());
             groupNewsMaterialAddDTO.setMediaId(materialDTO.getMediaId());
+            boolean exists = StrUtil.isBlank(materialDTO.getMediaId());
             try {
                 String mediaId = ResponseHandleUtil.parseResponse(materialService.getGroupNewsMaterial(groupNewsMaterialAddDTO), String.class);
                 if (StrUtil.isNotBlank(mediaId)) {
                     BizMaterial bizMaterial = new BizMaterial();
                     bizMaterial.setAccountId(Math.toIntExact(account.getAccountId()));
-                    bizMaterial.setBizId(Math.toIntExact(materialDTO.getId()));
+                    bizMaterial.setBizId(Math.toIntExact(materialDTO.getBookGroupQrcodeId()));
                     bizMaterial.setBizType(UseTypeEnum.NORMAL_GROUP.value);
-                    bizMaterial.setCreateTime(new Date());
+                    if(exists){
+                        bizMaterial.setCreateTime(new Date());
+                    }
                     bizMaterial.setMediaId(mediaId);
                     String materialUrl = ResponseHandleUtil.parseResponse(materialService.getGroupNewsMaterialByMediaId(mediaId), String.class);
                     bizMaterial.setMaterialUrl(materialUrl);

pcloud-service-book/src/main/resources/mapper/group/BizMaterialMapper.xml

@@ -153,16 +153,21 @@
     </select>
 
     <insert id="insertOrUpdate">
-        insert into book.biz_material (media_id, material_url, account_id, biz_type, biz_id, create_time, update_time)
+        insert into book.biz_material (media_id, material_url, account_id, biz_type, biz_id,
+            <if test="createTime!=null">
+                create_time,
+            </if>
+             update_time)
         values
-            (#{mediaId}, #{materialUrl}, #{accountId}, #{bizType}, #{bizId}, #{createTime}, NOW())
+            (#{mediaId}, #{materialUrl}, #{accountId}, #{bizType}, #{bizId},
+             <if test="createTime!=null">
+                #{createTime},
+            </if>
+             NOW())
         on duplicate key update
         media_id = values(media_id),
         material_url = values(material_url),
         account_id = values(account_id),
-        biz_type = values(biz_type),
-        biz_id = values(biz_id),
-        create_time = values(create_time),
         update_time = values(update_time)
     </insert>