Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatTemplateLogic.java

@@ -4,7 +4,6 @@ import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gree.mall.manager.bean.admin.reqDto.AdminCompanyWechatTemplateUpdateReqDto;
 import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminCompanyWechatTemplate;
 import com.gree.mall.manager.plus.service.AdminCompanyWechatTemplateService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +49,29 @@ public class AdminCompanyWechatTemplateLogic {
      */
     public void updateCompanyWithTemplate(AdminCompanyWechatTemplateUpdateReqDto reqDto){
 
+        if(StringUtils.isEmpty(reqDto.getCompanyWechatId())){
+            throw new RemoteServiceException("企业微信id不能为null");
+        }
+
+        final AdminCompanyWechatTemplate wechatTemplate = adminCompanyWechatTemplateService.lambdaQuery()
+                .last("limit 1")
+                .one();
+
+        adminCompanyWechatTemplateService.lambdaUpdate()
+                .set(AdminCompanyWechatTemplate::getMinLogo1, reqDto.getMainLog())
+                .set(AdminCompanyWechatTemplate::getMinLogo2, reqDto.getCommonLog())
+                .set(AdminCompanyWechatTemplate::getMinLogo3, reqDto.getMinLogo())
+                .eq(AdminCompanyWechatTemplate::getCompanyWechatTemplateId, wechatTemplate.getCompanyWechatTemplateId())
+                .update();
+
+//        AdminCompanyWechat adminCompanyWechat = new AdminCompanyWechat();
+//        adminCompanyWechat.setCompanyWechatId(reqDto.getCompanyWechatId());
+//        adminCompanyWechat.setUseTemplate(reqDto.getUseTemplate());
+//        adminCompanyWechat.setMinLogo1(reqDto.getMainLog());
+//        adminCompanyWechat.setMinLogo2(reqDto.getCommonLog());
+//        adminCompanyWechat.setMinLogo3(reqDto.getMinLogo());
+//        adminCompanyWechat.updateById();
+
         List<AdminCompanyWechatTemplate> templateList = reqDto.getCompanyWechatTemplatesList();
         if(CollectionUtils.isNotEmpty(templateList)){
             for (AdminCompanyWechatTemplate template:templateList