接口开发

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/LicenceOrderController.java

@@ -42,7 +42,7 @@ import java.util.List;
  * @since 2023-03-09
  */
 @RestController
-@RequestMapping("/licence-order")
+@RequestMapping("/operation-licence-order")
 public class LicenceOrderController {
 
     private static Logger logger = LogManager.getLogger(LicenceOrderController.class);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java

@@ -206,7 +206,16 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
             wxEnterpriseName=wxEnterpriseDTO.getCorpName();
         }
         String dateToStr = DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
-        String msg = "标题：企微账号许可通知\n品牌名称:"+enterpriseName+"\n"+"企业名称："+wxEnterpriseName+"\n"+"消息内容："+dateToStr+"订单编号为"+licenceOrder.getTransactionId()+",请尽快处理";
+        //发送钉钉消息通知
+        String host = config.getHost();
+        // 最后一个分隔符位置
+        int lastIndex = host.lastIndexOf("/");
+        // 倒数第二个分隔符位置
+        int secondLastIndex = host.lastIndexOf("/", lastIndex - 1);
+        String subHost = host.substring(0, secondLastIndex + 1);
+        String url = subHost + "enterprise-operation/#/finance-config/wx-order-detail?tabId=wx_account_order&orderId="+orderId;
+        String msg = "标题：企微账号许可通知\n品牌名称:"+enterpriseName+"\n"+"企业名称："+wxEnterpriseName+"\n"+"消息内容："+dateToStr+
+                "订单编号为"+orderId+",请尽快处理！\n"+url;
         DingUtils.send(msg,"https://oapi.dingtalk.com/robot/send?access_token=63074c9fc1ac2c00aa62477facdf16e5fa2388cf6a621edba1fb05d6e55d031f",false);
         return ServiceResponse.success(true);
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

@@ -6,6 +6,8 @@ import com.gic.clerk.api.dto.AuthorizedUser;
 import com.gic.commons.util.DateUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.UploadUtils;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -53,7 +55,10 @@ public class UploadController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         //获取登录人信息
-        final AuthorizedUser au = SessionContextUtils.getLoginUser();
+        WebLoginDTO au = AuthWebRequestUtil.getLoginUser();
+        if(null == au){
+            return resultResponse(HaoBanErrCode.ERR_4);
+        }
         EnterpriseDTO enterprise = this.enterpriseService.getEnterpriseById(au.getEnterpriseId());
         if (null == enterprise) {
             return resultResponse(HaoBanErrCode.ERR_OTHER, "商户不存在");