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

admin/src/main/java/com/onsiteservice/admin/controller/banner/BannerController.java

 package com.onsiteservice.admin.controller.banner;
 
+import com.onsiteservice.common.annotation.user.CurrentUserId;
 import com.onsiteservice.entity.banner.Banner;
 import com.onsiteservice.admin.service.banner.BannerService;
 
@@ -51,8 +52,8 @@ public class BannerController {
 
     @ApiOperation(value = "新增或修改", notes = "作者: 商天翔")
     @PostMapping("/save-or-update")
-    public Result saveOrUpdate(@RequestBody @NonNull @Validated Banner banner) {
-        return success(bannerService.saveOrUpdate(banner), banner.getId() == null ? "新增成功" : "修改成功");
+    public Result saveOrUpdate(@RequestBody @NonNull @Validated Banner banner, @CurrentUserId Long userId) {
+        return success(bannerService.saveOrUpdate(banner, userId), banner.getId() == null ? "新增成功" : "修改成功");
     }
 
     @PutMapping("/enable")

admin/src/main/java/com/onsiteservice/admin/service/banner/BannerService.java

 package com.onsiteservice.admin.service.banner;
 
+import com.onsiteservice.dao.util.EntityUtils;
 import com.onsiteservice.entity.banner.Banner;
 import com.onsiteservice.dao.mapper.banner.BannerMapper;
 import com.onsiteservice.admin.mapper.banner.BannerBizMapper;
@@ -43,11 +44,13 @@ public class BannerService extends AbstractMapper<Banner> {
     /**
      * 保存或更新方法
      */
-    public int saveOrUpdate(Banner banner) {
+    public int saveOrUpdate(Banner banner, Long userId) {
         if (banner.getId() == null) {
+            EntityUtils.insert(banner, userId);
             return this.insertSelective(banner);
         } else {
-            return this.updateByPrimaryKeySelective(banner);
+            EntityUtils.update(banner, userId);
+            return this.updateByPrimaryKeySelectiveForce(banner, List.of("mpArticle"));
         }
     }
 

admin/src/main/java/com/onsiteservice/admin/service/weixin/AdminWeixinService.java

@@ -26,7 +26,7 @@ public class AdminWeixinService {
         try {
             // 获取base64数据
             byte[] qrCode = wxMaService.getQrcodeService().createWxaCodeUnlimitBytes(miniQrCodeDTO.getScene(),
-                    miniQrCodeDTO.getPath(), miniQrCodeDTO.getWidth(), false, new WxMaCodeLineColor("0", "0", "0"), false);
+                    miniQrCodeDTO.getPath(),false, "release", miniQrCodeDTO.getWidth(), false, new WxMaCodeLineColor("0", "0", "0"), false);
             return success(qrCode, "获取微信小程序码成功");
         } catch (Exception e) {
             throw new ServiceException("获取微信小程序码失败");

common/src/main/java/com/onsiteservice/service/order/ServiceOrderService.java

@@ -190,7 +190,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         if (result == 1) {
             String description = String.format(ServiceOrderStatusEnum.SEND.getMsg(), (user.getIsAdmin() ? ServiceUserTypeEnum.ADMIN.getName() : ServiceUserTypeEnum.VALUATOR.getName()) + user.getName());
-            recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.SEND.getStatus(), description, sourceEnum, null, null, null);
+            recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.SEND.getStatus(), description, sourceEnum, userId, null, null);
         }
 
         return result;

entity/src/main/java/com/onsiteservice/entity/banner/Banner.java

@@ -35,10 +35,14 @@ public class Banner implements Serializable {
     @ApiModelProperty("图片地址")
     private String url;
 
+    @Column(name = "mp_article")
+    @ApiModelProperty("文章连接")
+    private String mpArticle;
+
     /**
      * 跳转类型 0 不跳转 1 图片 ,其他业务
      */
-    @ApiModelProperty("跳转类型 0 不跳转 1 图片 ,其他业务")
+    @ApiModelProperty("跳转类型 0 不跳转 1 图片 2 文章")
     private Integer type;
 
     /**

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/vo/BannerVO.java

@@ -19,9 +19,12 @@ public class BannerVO {
     @ApiModelProperty("图片地址")
     private String url;
 
-    @ApiModelProperty("跳转类型 0 不跳转 1 图片 ,其他业务")
+    @ApiModelProperty("跳转类型 0 不跳转 1 图片 ,2 文章")
     private Integer type;
 
+    @ApiModelProperty("文章链接")
+    private String mpArticle;
+
     @ApiModelProperty("跳转内容 如果是图片存url如果是资讯存id")
     private String target;
 

mini-app/src/main/java/com/onsiteservice/miniapp/controller/weixn/WechatNotifyController.java

@@ -93,7 +93,7 @@ public class WechatNotifyController {
             }
 
         } catch (Exception e) {
-            log.error("notify() Exception exception:{}", e.getMessage());
+            log.error("notify() Exception exception:", e);
             e.printStackTrace();
         }
     }

mini-app/src/main/java/com/onsiteservice/miniapp/service/weixin/WeiXinService.java

@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.google.common.collect.ImmutableMap;
 import com.onsiteservice.common.service.dto.MiniQrCodeDTO;
+import com.onsiteservice.constant.enums.EnvironmentEnum;
 import com.onsiteservice.constant.enums.ServiceUserTypeEnum;
 import com.onsiteservice.core.exception.ServiceException;
 import com.onsiteservice.core.result.Result;
@@ -21,6 +22,7 @@ import io.micrometer.core.instrument.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,6 +51,8 @@ public class WeiXinService {
     private UserService userService;
     @Resource
     private ServicePromoteService promoteService;
+    @Value("${spring.profiles.active:dev}")
+    private String env;
 
 
     /**
@@ -61,6 +65,7 @@ public class WeiXinService {
                 // 获取openid、unionid、session_key等
                 sessionResult = wxMaService.getUserService().getSessionInfo(loginDTO.getCode());
             } catch (WxErrorException e) {
+                e.printStackTrace();
                 throw new ServiceException("微信小程序登录失败:" + e.getMessage());
             }
             String unionId = sessionResult.getUnionid(); // unionId需要先在微信开放平台绑定平台
@@ -157,10 +162,16 @@ public class WeiXinService {
     public Result getQrCode(MiniQrCodeDTO miniQrCodeDTO) {
         try {
             // 获取base64数据
-            byte[] qrCode = wxMaService.getQrcodeService().createWxaCodeUnlimitBytes(miniQrCodeDTO.getScene(),
-                    miniQrCodeDTO.getPath(), miniQrCodeDTO.getWidth(), false, new WxMaCodeLineColor("0", "0", "0"), false);
+            byte[] qrCode = wxMaService.getQrcodeService().createWxaCodeUnlimitBytes(
+                    miniQrCodeDTO.getScene(),
+                    miniQrCodeDTO.getPath(),
+                    false,
+                    "release",
+                    miniQrCodeDTO.getWidth(),
+                    false, new WxMaCodeLineColor("0", "0", "0"), false);
             return success(qrCode, "获取微信小程序码成功");
         } catch (Exception e) {
+            log.error("{}", e);
             throw new ServiceException("获取微信小程序码失败");
         }
     }

pom.xml

@@ -22,7 +22,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <mapstruct.version>1.3.1.Final</mapstruct.version>
         <lombok.version>1.18.12</lombok.version>
-        <weixin.version>4.2.0</weixin.version>
+        <weixin.version>4.3.0</weixin.version>
     </properties>
 
     <!-- 项目子模块 -->