修改bug

huanghongfa

2021-08-15 a1e30f41fa0ff29822f5665f3a4aecd659890fc0

修改bug

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java

@@ -59,7 +59,7 @@
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaJscode2SessionResult sessionInfo=null;
        try {
             sessionInfo = maService.getUserService().getSessionInfo(code);
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
@@ -125,6 +125,50 @@
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    }

    @ApiOperation(value = "维护微信用户手机号")
    @PostMapping("updateUserWeiXinPhone2")
    public R updateUserWeiXinPhone2(@RequestBody LoginRequest loginRequest){
        String code = loginRequest.getCode();
        if (ObjectUtils.isEmpty(code)) {
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaJscode2SessionResult sessionInfo=null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
                sessionInfo=new WxMaJscode2SessionResult();
                sessionInfo.setOpenid("88888888");
                sessionInfo.setSessionKey("9999999");
            }else{
                return R.fail("微信登录失败");
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));

        String encryptedData = loginRequest.getEncryptedData();
        String iv = loginRequest.getIv();
        boolean empty = ObjectUtils.isEmpty(iv);
        boolean empty1 = ObjectUtils.isEmpty(encryptedData);
        if (empty||empty1) {
            return R.fail("微信用户参数不全");
        }
//        WxMaService maService = wxMaConfiguration.getMaService();
        Long userId = this.getUserId();
//        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
//        LoginUserInfoVO loginUserInfoVO = r.getData();
        WxMaPhoneNumberInfo wxMaPhoneNumberInfo = maService.getUserService().getPhoneNoInfo(sessionInfo.getSessionKey(),
                encryptedData, iv);
        if (ObjectUtils.isEmpty(wxMaPhoneNumberInfo) || ObjectUtils.isEmpty(wxMaPhoneNumberInfo.getPhoneNumber())) {
            return R.fail("微信解析手机号失败");
        }
        String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    }

    @ApiOperation(value = "用户登出")
    @PostMapping("logout")
    public R updateUserWeiXinPhone(){

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java

@@ -11,44 +11,44 @@
public class ComActEasyPhotoStatisticsVO {

    @ApiModelProperty("待审核数量")
    private Integer examineNum;
    private Integer examineNum = 0;

    @ApiModelProperty("待验证数量")
    private Integer verificationNum;
    private Integer verificationNum = 0;

    @ApiModelProperty("已驳回数量")
    private Integer rejectNum;
    private Integer rejectNum = 0;

    @ApiModelProperty("已完成数量")
    private Integer completeNum;
    private Integer completeNum = 0;

    @ApiModelProperty("优质数量")
    private Integer yzAllTotal;
    private Integer yzAllTotal = 0;

    @ApiModelProperty("今日优质数量")
    private Integer yzDayTotal;
    private Integer yzDayTotal = 0;

    @ApiModelProperty("精良数量")
    private Integer jlAllTotal;
    private Integer jlAllTotal = 0;

    @ApiModelProperty("今日精良数量")
    private Integer jlDayTotal;
    private Integer jlDayTotal = 0;

    @ApiModelProperty("普通数量")
    private Integer ptAllTotal;
    private Integer ptAllTotal = 0;

    @ApiModelProperty("今日普通数量")
    private Integer ptDayTotal;
    private Integer ptDayTotal = 0;

    @ApiModelProperty("一般数量")
    private Integer ybAllTotal;
    private Integer ybAllTotal = 0;

    @ApiModelProperty("今日一般数量")
    private Integer ybDayTotal;
    private Integer ybDayTotal = 0;

    @ApiModelProperty("奖励总数量")
    private BigDecimal allRewardAmount;
    private BigDecimal allRewardAmount = BigDecimal.ZERO;

    @ApiModelProperty("今日奖励数量")
    private BigDecimal dayRewardAmount;
    private BigDecimal dayRewardAmount = BigDecimal.ZERO;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java

@@ -46,4 +46,7 @@
    @ApiModelProperty("交易备注")
    private String remark;

    @ApiModelProperty("交易业务id")
    private Long serviceId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletTradeDOMapper.xml

@@ -47,6 +47,7 @@
            cauwt.id,
            su.user_id,
            cauwt.amount,
            cauwt.service_id,
            cauwt.remark,
            cauwt.type,
            su.`name` AS userName,