新建分支

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -50,4 +50,28 @@ public class OrderController {
     private void testMessage(@RequestParam("tableId") String tableId, @RequestParam("message") String message) throws IOException {
         orderService.testMessage(tableId,message);
     }
+    @GetMapping("/tradeIntegral")
+    private Result tradeIntegral(@RequestParam("userId") String userId, @RequestParam("id") String id) throws IOException {
+        return orderService.tradeIntegral(userId,id);
+    }
+//    @GetMapping("/我的积分")
+//    private Result mineYhq(@RequestParam("userId") String userId) throws IOException {
+//        return orderService.mineYhq(userId);
+//    }
+    @GetMapping("/mineCoupons")
+    private Result mineCoupons(@RequestHeader String token,@RequestParam("userId") String userId,@RequestParam("status") String status,
+                               @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
+                               @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException {
+        return orderService.mineCoupons(userId,status,page,size);
+    }
+    @GetMapping("/findCoupons")
+    private Result findCoupons(@RequestHeader String token,
+                               @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
+                               @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException {
+        return orderService.findCoupons(page,size);
+    }
+    @GetMapping("/findWiningUser")
+    private Result findWiningUser(){
+        return orderService.findWiningUser();
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java

@@ -0,0 +1,79 @@
+package com.chaozhanggui.system.cashierservice.controller;
+
+
+import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.chaozhanggui.system.cashierservice.dao.TbMerchantAccountMapper;
+import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper;
+import com.chaozhanggui.system.cashierservice.entity.TbMerchantAccount;
+import com.chaozhanggui.system.cashierservice.entity.TbShopUser;
+import com.chaozhanggui.system.cashierservice.entity.dto.AuthUserDto;
+import com.chaozhanggui.system.cashierservice.entity.dto.OnlineUserDto;
+import com.chaozhanggui.system.cashierservice.entity.vo.IntegralVo;
+import com.chaozhanggui.system.cashierservice.entity.vo.OrderVo;
+import com.chaozhanggui.system.cashierservice.service.LoginService;
+import com.chaozhanggui.system.cashierservice.service.OnlineUserService;
+import com.chaozhanggui.system.cashierservice.service.UserService;
+import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
+import com.chaozhanggui.system.cashierservice.sign.Result;
+import com.chaozhanggui.system.cashierservice.util.IpUtil;
+import com.chaozhanggui.system.cashierservice.util.MD5Utils;
+import com.chaozhanggui.system.cashierservice.util.StringUtil;
+import com.chaozhanggui.system.cashierservice.util.TokenUtil;
+import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+@CrossOrigin(origins = "*")
+@RestController
+@Slf4j
+@RequestMapping("user")
+public class UserContoller {
+
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    private TbShopUserMapper shopUserMapper;
+
+
+    @GetMapping("/userInfo")
+    public JSONObject userInfo(@RequestParam("openId") String openId ) throws Exception {
+        TbShopUser shopUser = shopUserMapper.selectByOpenId(openId);
+        JSONObject jsonObject = new JSONObject();
+        if (Objects.isNull(shopUser)){
+            jsonObject.put("status","fail");
+            jsonObject.put("msg","用户不存在");
+            return jsonObject;
+        }
+        String userSign = UUID.randomUUID().toString().replaceAll("-","");
+        String token = TokenUtil.generateJfToken(openId,userSign);
+        JSONObject object = new JSONObject();
+        object.put("token",token);
+        object.put("userSign",userSign);
+        object.put("num",shopUser.getLevelConsume());
+        jsonObject.put("status","success");
+        jsonObject.put("msg","成功");
+        jsonObject.put("data",object);
+        return jsonObject;
+    }
+    @PostMapping("/modityIntegral")
+    public JSONObject modityIntegral(@RequestHeader String token,@RequestBody IntegralVo integralVo ) throws Exception {
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
+        String userSign = jsonObject.getString("userSign");
+        return userService.modityIntegral(integralVo,userSign);
+    }
+}