Procházet zdrojové kódy

fix

release_toaliyun_real
winter před 6 měsíci
rodič
revize
a61cab1c80
11 změnil soubory, kde provedl 77 přidání a 0 odebrání
  1. +21
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java
  2. +13
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java
  6. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
  7. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  8. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
  9. +11
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
  10. +4
    -0
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml
  11. +3
    -0
      mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml

+ 21
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java Zobrazit soubor

@@ -70,8 +70,29 @@ public class WxVtwoActivityOrderController extends BaseController {
if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){
throw new MallinkException(Result.ERROR,"订单状态不允许修改");
}
if (null != activityOrder.getFromOrderId()) {
WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder();
fromOrderQuery.updateTenantInfo(tenantEntity);
fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId());
fromOrderQuery.setNotInId(activityOrder.getId());
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder);
if (null != frecord) {
throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId");
}
}
activityOrder.setAuditRemark("");
}else {
if (null != activityOrder.getFromOrderId()) {
WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder();
fromOrderQuery.updateTenantInfo(tenantEntity);
fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId());
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder);
if (null != frecord) {
throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId");
}
}
}
activityOrder.setCreateBy(getMerchantBUserId());
activityOrder.setMerchantId(getLoginBUser().getMerchantId());
activityOrder.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());


+ 13
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Zobrazit soubor

@@ -634,6 +634,19 @@ public class WxUserGrantController extends BaseController {

return new ResultData(userVo);
}
@ApiOperation("注销用户")
@GetMapping("/cancelUser")
public ResultData cancelUser() {
CUser user = getCUser();
try {
cuserFactory.getCUserService(user.getAppPlat()).cancelUser(user);
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
return new ResultData(Result.SUCCESS, "注销成功");
}

@ApiOperation("当前用户名下是否有车")
@GetMapping("/carCount")


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java Zobrazit soubor

@@ -269,4 +269,7 @@ public class WxVtwoActivityOrder extends TenantEntity {

@TableField(exist = false)
private BigDecimal orderRatio;
@TableField(exist = false)
private Long notInId;
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java Zobrazit soubor

@@ -44,4 +44,6 @@ public interface WxCUserMapper extends CommonMapper<WxCUser, Long> {
List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto);

void updateAuthorizeStateByOpenId(WxCUser updCuser);
void delByOpenId( @Param("openId")String openId,@Param("tenantId")String tenantId);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java Zobrazit soubor

@@ -53,4 +53,6 @@ public interface CUserServiceApapter {
List<UserStructureVo> findCountData(WxCUserBasicInfoDto dto);

Long findCuserId(Long basicUserId,String tenantId);
void cancelUser(CUser user);
}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java Zobrazit soubor

@@ -293,4 +293,10 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer
setCache(token,baseUser);
}

@Override
public void cancelUser(CUser user) {
// TODO Auto-generated method stub
}

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java Zobrazit soubor

@@ -392,4 +392,10 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer
setCache(token,baseUser);
}

@Override
public void cancelUser(CUser user) {
// TODO Auto-generated method stub
}

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java Zobrazit soubor

@@ -340,4 +340,10 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer
setCache(token,baseUser);
}

@Override
public void cancelUser(CUser user) {
// TODO Auto-generated method stub
}

}

+ 11
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java Zobrazit soubor

@@ -440,4 +440,15 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer
setCache(token,baseUser);
}

@Override
public void cancelUser(CUser user) {
WxCUser newUser = new WxCUser();
newUser.updateTenantInfo(user);
newUser.setAppId(user.getAppId());
newUser.setOpenId(user.getOpenId());

wxCUserMapper.delByOpenId(user.getOpenId(),user.getTenantId());
cleanCuserToken(user.getToken());
}

}

+ 4
- 0
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Zobrazit soubor

@@ -447,4 +447,8 @@
and `open_id` = #{openId}
and `authorize_state` != #{authorizeState}
</update>
<delete id="delByOpenId" parameterType="hashmap">
delete from wx_c_user where `open_id` = #{openId} and tenant_id = #{tenantId}
</delete>
</mapper>

+ 3
- 0
mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml Zobrazit soubor

@@ -55,6 +55,9 @@
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != notInId ">
and `id` != #{notInId}
</if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>


Načítá se…
Zrušit
Uložit