无关风月
2024-12-24 1a2a7c2ccd782d5f8883a185c48542f9d323a2be
代码
4个文件已修改
3个文件已添加
135 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/dto/FrameInventoryDTO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/dto/LensInventoryDTO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/TCoupon.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometry/src/main/java/com/jilongda/optometry/controller/LoginController.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometry/src/main/java/com/jilongda/optometry/controller/TOptometristController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometry/src/main/java/com/jilongda/optometry/dto/OptometryLoginDTO.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java
@@ -6,6 +6,7 @@
import com.jilongda.manage.dto.FrameInventoryDTO;
import com.jilongda.manage.dto.GetCurrentByParam;
import com.jilongda.manage.dto.GetCurrentByParamLens;
import com.jilongda.manage.dto.LensInventoryDTO;
import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TFrameGoodsQuery;
import com.jilongda.manage.query.TInventoryQuery;
@@ -76,14 +77,14 @@
    }
    @ApiOperation(value = "镜片添加盘点")
    @PostMapping(value = "/addLensInventory")
    public ApiResult addLensInventory(@RequestBody FrameInventoryDTO query) {
    public ApiResult addLensInventory(@RequestBody LensInventoryDTO query) {
        TInventory tInventory = new TInventory();
        BeanUtils.copyProperties(query, tInventory);
        inventoryService.save(tInventory);
        for (TInventoryFrameDetail tInventoryFrameDetail : query.getList()) {
        for (TInventoryLensDetail tInventoryFrameDetail : query.getList()) {
            tInventoryFrameDetail.setInventoryId(tInventory.getId());
        }
        inventoryFrameDetailService.saveBatch(query.getList());
        inventoryLensDetailService.saveBatch(query.getList());
        return ApiResult.success();
    }
manage/src/main/java/com/jilongda/manage/dto/FrameInventoryDTO.java
@@ -11,7 +11,7 @@
import java.util.List;
@Data
@ApiModel(value = "镜架型号DTO")
@ApiModel(value = "镜架盘点DTO")
public class FrameInventoryDTO extends TInventory {
    @ApiModelProperty(value = "镜架明细")
manage/src/main/java/com/jilongda/manage/dto/LensInventoryDTO.java
New file
@@ -0,0 +1,19 @@
package com.jilongda.manage.dto;
import com.jilongda.manage.model.TInventory;
import com.jilongda.manage.model.TInventoryFrameDetail;
import com.jilongda.manage.model.TInventoryLensDetail;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(value = "镜片盘点DTO")
public class LensInventoryDTO extends TInventory {
    @ApiModelProperty(value = "镜架明细")
    private List<TInventoryLensDetail> list;
}
manage/src/main/java/com/jilongda/manage/model/TCoupon.java
@@ -37,7 +37,7 @@
    @ApiModelProperty(value = "优惠券名称")
    @TableField("name")
    private Integer name;
    private String name;
    @ApiModelProperty(value = "发放方式 1注册发放 2全局发放 3指定发放 4扫码发放")
    @TableField("type")
optometry/src/main/java/com/jilongda/optometry/controller/LoginController.java
New file
@@ -0,0 +1,78 @@
package com.jilongda.optometry.controller;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.redis.RedisAutoTemplate;
import com.jilongda.common.security.SecurityUtils;
import com.jilongda.common.utils.WebUtils;
import com.jilongda.optometry.model.TAppUser;
import com.jilongda.optometry.service.SecUserService;
import com.jilongda.optometry.service.TAppUserService;
import com.jilongda.optometry.wx.body.resp.Code2SessionRespBody;
import com.jilongda.optometry.wx.body.resq.Code2SessionResqBody;
import com.jilongda.optometry.wx.pojo.AppletUserDecodeData;
import com.jilongda.optometry.wx.pojo.AppletUserEncrypteData;
import com.jilongda.optometry.wx.utils.WeixinProperties;
import com.jilongda.optometry.wx.utils.WxAppletTools;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import java.util.Map;
/**
 * <p>
 * 会员表 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2021-07-28
 */
@Slf4j
@Api(tags = "用户登录相关")
@RestController
@RequestMapping("/")
public class LoginController {
    @Autowired
    private SecurityUtils securityUtils;
    @Autowired
    private AuthenticationManager authenticationManager;
    @Autowired
    private RedisAutoTemplate redisAutoTemplate;
    @Autowired
    private TAppUserService appUserService;
    @Autowired
    private WeixinProperties wxConfig;
    @Autowired
    private RestTemplate wxRestTemplate;
    @Autowired
    private SecUserService secUserService;
    @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
    @PostMapping("/openIdByJsCode")
    public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
//        secUserService.lambdaQuery().eq(TAppUser::getOpenId, data.getOpenId()).one();
        Map<String, Object> tokenInfos = securityUtils.login(null, null, authenticationManager, TAppUser.class, 3);
        return ApiResult.success(tokenInfos);
    }
    @ApiOperation("退出登录")
    @GetMapping("logout")
    public ApiResult<String> logout() {
        boolean flag = securityUtils.invalidateToken(WebUtils.request());
        if (flag) {
            return ApiResult.success("退出成功");
        }
        return ApiResult.success();
    }
}
optometry/src/main/java/com/jilongda/optometry/controller/TOptometristController.java
@@ -1,6 +1,7 @@
package com.jilongda.optometry.controller;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,6 +15,7 @@
 * @since 2024-12-09
 */
@RestController
@Api(tags = "验光师小程序")
@RequestMapping("/t-optometrist")
public class TOptometristController {
optometry/src/main/java/com/jilongda/optometry/dto/OptometryLoginDTO.java
New file
@@ -0,0 +1,25 @@
package com.jilongda.optometry.dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
 * @author xiaochen
 * @ClassName LoginDto
 * @Description
 * @date 2020-08-20 17:52
 */
@Data
@ApiModel("登录相关dto")
public class OptometryLoginDTO {
    private String code;
    private String openId;
    @NotBlank(message = "账号不能为空")
    private String phone;
    private String password;
}