lsw 9 månader sedan
förälder
incheckning
4935a5afd5

+ 1 - 1
admin-ui/src/views/work/pay/edit.vue

@@ -85,7 +85,7 @@ export default {
     submitForm(state) {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.$prompt(state == 1 ? '确认已转账到 ' + this.user.bankAccount + ' 银行账户? 该操作不可撤销!' : '确认驳回提现(退款)', {
+          this.$prompt(state == 1 ? '确认允许该用户提现余额? 该操作不可撤销!' : '确认驳回提现(退款)', {
             type: 'warning',
             showInput: state == 1 ? false : true,
             inputType: 'textarea',

+ 4 - 0
app/pages/statement/packages/index.vue

@@ -21,6 +21,10 @@
 					<view class="lable">结算日期</view>
 					<view class="desc">{{ item.balanceDate }}</view>
 				</view>
+				<view class="it">
+					<view class="lable">任务明细</view>
+					<view class="desc">{{ item.contents || '' }}</view>
+				</view>
 				<view class="op">
 					<text>{{ item.createTime }}</text>
 					<text class="add" @click="add(item)" v-if="current == 0">接任务</text>

+ 1 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ResumeDeliverServiceImpl.java

@@ -106,7 +106,6 @@ public class ResumeDeliverServiceImpl extends ServiceImpl<ResumeDeliverMapper, R
         }
         //兼职接单成功,把兼职设置成进行中...
         if (resumeDeliver.getType() == 1 && resumeDeliver.getIsAccept() == 0 && dto.getIsAccept() == 1) {
-            System.out.println("zzzzz");
             String key = CacheConstants.APP_DELIVER + resumeDeliver.getId() + "-" + AppUtil.getUser().getId();
             if (redisCache.getCacheObject(key) == null) {
                 resumeDeliver.setIsExpire(1);
@@ -164,7 +163,7 @@ public class ResumeDeliverServiceImpl extends ServiceImpl<ResumeDeliverMapper, R
         if (resumeDeliver.getIsExpire() == 1) {
             return AjaxResult.error("对方超时未操作(已过期)");
         }
-        List<ResumeDeliver> list = selectList(new ResumeDeliver().setPositionId(resumeDeliver.getPositionId()).setState(1).setIsExpire(0));
+        List<ResumeDeliver> list = selectList(new ResumeDeliver().setPositionId(resumeDeliver.getPositionId()).setState(1).setIsExpire(0).setIsAccept(0));
         if (!list.isEmpty() && list.size() > 0) {
             return AjaxResult.error("排队中...你已发出一份兼职邀请,请等待对方答复后或者1小时无回应再操作");
         }