促销员今日活动上报

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

+package com.wangxiaolu.promotion.controller.activity.temporary;
+
+import com.wangxiaolu.promotion.pojo.activity.temporary.vo.TemporaryActivityDataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-04-17 19
+ * @describe : 促销员活动上报、修改
+ */
+@Slf4j
+@RestController
+@RequestMapping("/activity/temporary/core")
+public class TemporaryActivityCoreController {
+
+    /**
+     * 促销员今日活动上报
+     * 返回活动生成id
+     */
+    @PostMapping("/today/reported")
+    public Long todayActivityDataReported(@RequestBody TemporaryActivityDataVo activityVo){
+        /**
+         *
+         */
+        return 0l;
+    }
+
+
+
+}

src/main/java/com/wangxiaolu/promotion/controller/wechat/WeChatUserQueryController.java

@@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
 /**
@@ -42,8 +41,12 @@ public class WeChatUserQueryController {
     /**
      * 促销员信息查询
      */
-    @GetMapping("/temporary/phone_openid")
-    public WxTemporaryInfoDto getTemporaryInfoByOpenId(@RequestBody WxTemporaryLoginVo wxTemporaryLoginVo) {
-        return weChatUserQueryService.getTemporaryByToken(wxTemporaryLoginVo.getOpenId(),wxTemporaryLoginVo.getPhone());
+    @PostMapping("/temporary/phone_openid")
+    public WxTemporaryInfoDto getTemporaryInfoByOpenIdAndPhone(@RequestBody WxTemporaryLoginVo wxTemporaryLoginVo) {
+        WxTemporaryInfoDto temporaryInfoDto = weChatUserQueryService.getTemporaryInfoByOpenIdAndPhone(wxTemporaryLoginVo.getOpenId(), wxTemporaryLoginVo.getPhone());
+        if (Objects.isNull(temporaryInfoDto)) {
+            throw new ParamException(RCode.LOGIN_PARAM_ERROR, null);
+        }
+        return temporaryInfoDto;
     }
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryActivityDataVo.java

+package com.wangxiaolu.promotion.pojo.activity.temporary.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-04-17 19
+ * @describe :
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class TemporaryActivityDataVo {
+
+    /**
+     * 活动店铺
+     */
+    private String shopName;
+
+    /**
+     * 店铺地址
+     */
+    private String shopAddress;
+
+    /**
+     * 促销员id
+     * temporaryInfo表id
+     */
+    private Integer temporaryId;
+
+    /**
+     * 促销员姓名
+     * temporaryInfo表name
+     */
+    private String temporaryName;
+
+
+
+
+
+
+}

src/main/java/com/wangxiaolu/promotion/pojo/user/dto/WxTemporaryInfoDto.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author : liqiulin
  * @date : 2024-04-08 16
@@ -76,4 +78,9 @@ public class WxTemporaryInfoDto {
      * 详细地址
      */
     String address;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 }

src/main/java/com/wangxiaolu/promotion/service/wechat/WeChatUserQueryService.java

@@ -11,7 +11,5 @@ public interface WeChatUserQueryService {
 
     boolean loginTemporaryByOpenIdAndPhone(String openId,String phone);
 
-    WxTemporaryInfoDto getTemporaryByToken(String openId);
-
-    WxTemporaryInfoDto getTemporaryByToken(String openId,String phone);
+    WxTemporaryInfoDto getTemporaryInfoByOpenIdAndPhone(String openId,String phone);
 }

src/main/java/com/wangxiaolu/promotion/service/wechat/impl/WeChatUserQueryServiceImpl.java

@@ -50,26 +50,9 @@ public class WeChatUserQueryServiceImpl implements WeChatUserQueryService {
         return exist;
     }
 
-    /**
-     * 不返回身份证照片等重要信息，详情请查看sql语句
-     */
-    @Override
-    public WxTemporaryInfoDto getTemporaryByToken(String openId) {
-        // todo 先查询redis中是否有缓存数据
-        String key = RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey();
-
-        // todo redis中没有缓存数据，则进行查询
-        WxTemporaryInfoDto temporaryInfoDto = temporaryInfoDao.getUnimportantData(openId);
-        if (Objects.isNull(temporaryInfoDto)) {
-            throw new ParamException(RCode.LOGIN_PARAM_ERROR, null);
-        }
-
-        return temporaryInfoDto;
-    }
-
     @Override
-    public WxTemporaryInfoDto getTemporaryByToken(String openId, String phone) {
-        return null;
+    public WxTemporaryInfoDto getTemporaryInfoByOpenIdAndPhone(String openId, String phone) {
+        return temporaryInfoDao.getUnimportantData(openId, phone);
     }
 
 }