1、修改已知bug

citu-framework/citu-spring-boot-starter-security/src/main/java/com/citu/framework/security/core/util/SecurityFrameworkUtils.java

@@ -136,14 +136,14 @@ public class SecurityFrameworkUtils {
      * @return 部门编号
      */
     @Nullable
-    public static Long getLoginUserDataId2() {
+    public static <T> T getLoginUserDataId(Class<T> type) {
         LoginUser loginUser = getLoginUser();
         if (CollUtil.isEmpty(loginUser.getInfo())
                 || null == loginUser.getInfo()
                 || !loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
             throw exception(FORBIDDEN);
         }
-        return MapUtil.getLong(loginUser.getInfo(), LoginUser.INFO_KEY_DATA_ID);
+        return MapUtil.get(loginUser.getInfo(), LoginUser.INFO_KEY_DATA_ID, type);
     }
 
     /**

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/order/PayOrderController.java

@@ -2,6 +2,7 @@ package com.citu.module.pay.controller.admin.order;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.excel.core.util.ExcelUtils;
@@ -11,6 +12,7 @@ import com.citu.module.pay.convert.order.PayOrderConvert;
 import com.citu.module.pay.dal.dataobject.app.PayAppDO;
 import com.citu.module.pay.dal.dataobject.order.PayOrderDO;
 import com.citu.module.pay.dal.dataobject.order.PayOrderExtensionDO;
+import com.citu.module.pay.framework.pay.core.CurrencyPayClient;
 import com.citu.module.pay.framework.pay.core.WalletPayClient;
 import com.citu.module.pay.service.app.PayAppService;
 import com.citu.module.pay.service.order.PayOrderService;
@@ -35,6 +37,7 @@ import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertList;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 
@@ -84,6 +87,13 @@ public class PayOrderController {
             channelExtras.put(WalletPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
             reqVO.setChannelExtras(channelExtras);
         }
+        // 自定义货币支付 支付
+        if (Objects.equals(reqVO.getChannelCode(), PayChannelEnum.CURRENCY.getCode())) {
+            Map<String, String> channelExtras = reqVO.getChannelExtras() == null ?
+                    Maps.newHashMapWithExpectedSize(1) : reqVO.getChannelExtras();
+            channelExtras.put(CurrencyPayClient.USER_TYPE_KEY, String.valueOf(UserTypeEnum.MEMBER.getValue()));
+            reqVO.setChannelExtras(channelExtras);
+        }
 
         // 2. 提交支付
         PayOrderSubmitRespVO respVO = orderService.submitOrder(reqVO, getClientIP());
@@ -109,7 +119,7 @@ public class PayOrderController {
     @PreAuthorize("@ss.hasPermission('pay:order:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportOrderExcel(@Valid PayOrderExportReqVO exportReqVO,
-            HttpServletResponse response) throws IOException {
+                                 HttpServletResponse response) throws IOException {
         List<PayOrderDO> list = orderService.getOrderList(exportReqVO);
         if (CollectionUtil.isEmpty(list)) {
             ExcelUtils.write(response, "支付订单.xls", "数据",

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/currency/AppPayCurrencyController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId2;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 /**
@@ -39,7 +39,7 @@ public class AppPayCurrencyController {
     @PreAuthenticated
     public CommonResult<AppPayCurrencyRespVO> getPayCurrency() {
         PayCurrencyDO currency = payCurrencyService.getOrCreateCurrency(
-                getLoginUserDataId2(), getLoginUserId(), UserTypeEnum.MEMBER.getValue());
+                getLoginUserDataId(Long.class), getLoginUserId(), UserTypeEnum.MEMBER.getValue());
         return success(PayCurrencyConvert.INSTANCE.convert(currency));
     }
 

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/currency/AppPayCurrencyRechargeController.java

@@ -27,7 +27,6 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertList;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId2;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 
@@ -48,7 +47,7 @@ public class AppPayCurrencyRechargeController {
     public CommonResult<AppPayCurrencyRechargeCreateRespVO> createCurrencyRecharge(
             @Valid @RequestBody AppPayCurrencyRechargeCreateReqVO reqVO) {
         PayCurrencyRechargeDO currencyRecharge = currencyRechargeService.createCurrencyRecharge(
-                getLoginUserDataId2(), getLoginUserId(), getLoginUserType(), getClientIP(), reqVO);
+                getLoginUserDataId(Long.class), getLoginUserId(), getLoginUserType(), getClientIP(), reqVO);
         return success(PayCurrencyRechargeConvert.INSTANCE.convert(currencyRecharge));
     }
 
@@ -56,7 +55,7 @@ public class AppPayCurrencyRechargeController {
     @Operation(summary = "获得货币账户充值记录分页")
     public CommonResult<PageResult<AppPayCurrencyRechargeRespVO>> getCurrencyRechargePage(@Valid PageParam pageReqVO) {
         PageResult<PayCurrencyRechargeDO> pageResult = currencyRechargeService.getCurrencyRechargePackagePage(
-                getLoginUserDataId2(), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO, true);
+                getLoginUserDataId(Long.class), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO, true);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return success(PageResult.empty(pageResult.getTotal()));
         }

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/currency/AppPayCurrencyTransactionController.java

@@ -26,7 +26,7 @@ import java.time.LocalDateTime;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId2;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "用户 APP - 货币账户余额明细")
@@ -44,7 +44,7 @@ public class AppPayCurrencyTransactionController {
     public CommonResult<PageResult<AppPayCurrencyTransactionRespVO>> getCurrencyTransactionPage(
             @Valid AppPayCurrencyTransactionPageReqVO pageReqVO) {
         PageResult<PayCurrencyTransactionDO> pageResult = payCurrencyTransactionService.getCurrencyTransactionPage(
-                getLoginUserDataId2(), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO);
+                getLoginUserDataId(Long.class), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), pageReqVO);
         return success(BeanUtils.toBean(pageResult, AppPayCurrencyTransactionRespVO.class));
     }
 
@@ -54,7 +54,7 @@ public class AppPayCurrencyTransactionController {
     public CommonResult<AppPayCurrencyTransactionSummaryRespVO> getCurrencyTransactionSummary(
             @RequestParam("createTime") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime[] createTime) {
         AppPayCurrencyTransactionSummaryRespVO summary = payCurrencyTransactionService.getCurrencyTransactionSummary(
-                getLoginUserDataId2(), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), createTime);
+                getLoginUserDataId(Long.class), getLoginUserId(), UserTypeEnum.MEMBER.getValue(), createTime);
         return success(summary);
     }
 

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/order/AppPayOrderController.java

@@ -7,6 +7,7 @@ import com.citu.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
 import com.citu.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
 import com.citu.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
 import com.citu.module.pay.convert.order.PayOrderConvert;
+import com.citu.module.pay.framework.pay.core.CurrencyPayClient;
 import com.citu.module.pay.framework.pay.core.WalletPayClient;
 import com.citu.module.pay.service.order.PayOrderService;
 import com.google.common.collect.Maps;
@@ -23,6 +24,7 @@ import java.util.Objects;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 
@@ -55,6 +57,15 @@ public class AppPayOrderController {
             channelExtras.put(WalletPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
             reqVO.setChannelExtras(channelExtras);
         }
+        // 自定义货币支付 支付
+        if (Objects.equals(reqVO.getChannelCode(), PayChannelEnum.CURRENCY.getCode())) {
+            Map<String, String> channelExtras = reqVO.getChannelExtras() == null ?
+                    Maps.newHashMapWithExpectedSize(3) : reqVO.getChannelExtras();
+            channelExtras.put(CurrencyPayClient.USER_ID_KEY, String.valueOf(getLoginUserId()));
+            channelExtras.put(CurrencyPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
+            channelExtras.put(CurrencyPayClient.DATA_ID_KEY, getLoginUserDataId(String.class));
+            reqVO.setChannelExtras(channelExtras);
+        }
 
         // 2. 提交支付
         PayOrderSubmitRespVO respVO = payOrderService.submitOrder(reqVO, getClientIP());

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyServiceImpl.java

@@ -52,8 +52,7 @@ public class PayCurrencyServiceImpl implements PayCurrencyService {
         PayCurrencyDO currency = currencyMapper.selectByUserIdAndType(dataId, userId, userType);
         if (currency == null) {
             currency = new PayCurrencyDO().setDataId(dataId).setUserId(userId).setUserType(userType)
-                    .setBalance(0L).setTotalExpense(0L).setTotalRecharge(0L);
-            currency.setCreateTime(LocalDateTime.now());
+                    .setBalance(0L).setFreezePrice(0L).setTotalExpense(0L).setTotalRecharge(0L);
             currencyMapper.insert(currency);
         }
         return currency;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/eduexp/EduExpDO.java

@@ -39,6 +39,7 @@ public class EduExpDO extends TenantBaseDO {
     /**
      * 学校id
      */
+    @TableField( updateStrategy = FieldStrategy.ALWAYS)
     private Long schoolId;
     /**
      * 学校名称（没有选择系统企业可自定义）
@@ -59,6 +60,7 @@ public class EduExpDO extends TenantBaseDO {
     /**
      * 专业id
      */
+    @TableField( updateStrategy = FieldStrategy.ALWAYS)
     private Long majorId;
     /**
      * 专业名称（没有选择系统企业可自定义）

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/workexp/WorkExpDO.java

@@ -36,6 +36,7 @@ public class WorkExpDO extends TenantBaseDO {
     /**
      * 企业id
      */
+    @TableField( updateStrategy = FieldStrategy.ALWAYS)
     private Long enterpriseId;
     /**
      * 企业名称（没有选择系统企业时可自定义）
@@ -52,6 +53,7 @@ public class WorkExpDO extends TenantBaseDO {
     /**
      * 所属职位
      */
+    @TableField( updateStrategy = FieldStrategy.ALWAYS)
     private Long positionId;
     /**
      * 职位名称（没有选择系统职位时可自定义）

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImpl.java

@@ -3,12 +3,12 @@ package com.citu.module.menduner.system.service.eduexp;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.jobhunt.person.eduexp.AppEduExpSaveReqVO;
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.mysql.eduexp.EduExpMapper;
-import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -90,7 +90,7 @@ public class EduExpServiceImpl implements EduExpService {
         EduExpDO entity = eduExpMapper.selectOne(EduExpDO::getId, reqVO.getId());
         EduExpDO eduExpDO = BeanUtils.toBean(reqVO, EduExpDO.class);
         eduExpDO.setUserId(userId);
-        if (null == reqVO.getId()) {
+        if (null == entity || null == reqVO.getId()) {
             eduExpMapper.insert(eduExpDO);
         } else {
             eduExpDO.setId(entity.getId());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobInterestedServiceImpl.java

@@ -95,7 +95,7 @@ public class JobInterestedServiceImpl implements JobInterestedService {
         JobInterestedDO entity = jobInterestedMapper.selectOne(JobInterestedDO::getId, reqVO.getId());
         JobInterestedDO jobInterestedDO = BeanUtils.toBean(reqVO, JobInterestedDO.class);
         jobInterestedDO.setUserId(userId);
-        if (null == reqVO.getId()) {
+        if (null == entity || null == reqVO.getId()) {
             jobInterestedMapper.insert(jobInterestedDO);
         } else {
             jobInterestedDO.setId(entity.getId());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/projectexp/ProjectExpServiceImpl.java

@@ -90,7 +90,7 @@ public class ProjectExpServiceImpl implements ProjectExpService {
         ProjectExpDO entity = projectExpMapper.selectOne(ProjectExpDO::getId, reqVO.getId());
         ProjectExpDO projectExpDO = BeanUtils.toBean(reqVO, ProjectExpDO.class);
         projectExpDO.setUserId(userId);
-        if (null == reqVO.getId()) {
+        if (null == entity || null == reqVO.getId()) {
             projectExpMapper.insert(projectExpDO);
         } else {
             projectExpDO.setId(entity.getId());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/trainexp/TrainExpServiceImpl.java

@@ -85,7 +85,7 @@ public class TrainExpServiceImpl implements TrainExpService {
         TrainExpDO entity = trainExpMapper.selectOne(TrainExpDO::getId, reqVO.getId());
         TrainExpDO trainExpDO = BeanUtils.toBean(reqVO, TrainExpDO.class);
         trainExpDO.setUserId(userId);
-        if (null == reqVO.getId()) {
+        if (null == entity || null == reqVO.getId()) {
             trainExpMapper.insert(trainExpDO);
         } else {
             trainExpDO.setId(entity.getId());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImpl.java

@@ -90,7 +90,7 @@ public class WorkExpServiceImpl implements WorkExpService {
         WorkExpDO entity = workExpMapper.selectOne(WorkExpDO::getId, reqVO.getId());
         WorkExpDO eduExpDO = BeanUtils.toBean(reqVO, WorkExpDO.class);
         eduExpDO.setUserId(userId);
-        if (null == reqVO.getId()) {
+        if (null == entity || null == reqVO.getId()) {
             workExpMapper.insert(eduExpDO);
         } else {
             eduExpDO.setId(entity.getId());