lsw 9 mesiacov pred
rodič
commit
63681f3646

+ 1 - 1
app/pages/index/index.vue

@@ -36,7 +36,7 @@ export default {
 			tab: [
 				{ name: '推荐工作', orderBy: 'id', type: 0, recommend: 1, current: 1 },
 				{ name: '身边工作', orderBy: 'distance', type: 0, recommend: '', current: 2 },
-				{ name: '现结工作', orderBy: 'id', type: 1, recommend: 1, current: 0 }
+				{ name: '现结工作', orderBy: 'id', type: 1, recommend: 1, current: 1 }
 			],
 			list: [],
 			param: { pageNum: 1, pageSize: 8, type: 0, recommend: 1, current: 1 },

+ 4 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/PayServiceImpl.java

@@ -148,7 +148,8 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements IPayS
         }
         //转账到微信零钱
         if (pay.getWay() == 1 && pay.getState() == 1) {
-            BatchTransferModel batchTransferModel = new BatchTransferModel().setAppid(wxPayV3Bean.getAppId()).setOut_batch_no(PayKit.generateStr()).setBatch_name("账户余额提现到零钱").setBatch_remark("账户余额提现到零钱").setTotal_amount(pay.getMoney().multiply(new BigDecimal("100")).intValue()).setTotal_num(1).setTransfer_detail_list(Collections.singletonList(new TransferDetailInput().setOut_detail_no(PayKit.generateStr()).setTransfer_amount(pay.getMoney().multiply(new BigDecimal("100")).intValue()).setTransfer_remark("账户余额提现到零钱").setOpenid(user.getOpenId())));
+            BigDecimal money =(pay.getMoney().subtract(pay.getServiceMoney())).multiply(new BigDecimal("100"));
+            BatchTransferModel batchTransferModel = new BatchTransferModel().setAppid(wxPayV3Bean.getAppId()).setOut_batch_no(PayKit.generateStr()).setBatch_name("账户余额提现到零钱").setBatch_remark("账户余额提现到零钱").setTotal_amount(money.intValue()).setTotal_num(1).setTransfer_detail_list(Collections.singletonList(new TransferDetailInput().setOut_detail_no(PayKit.generateStr()).setTransfer_amount(money.intValue()).setTransfer_remark("账户余额提现到零钱").setOpenid(user.getOpenId())));
             IJPayHttpResponse response = WxPayApi.v3(RequestMethodEnum.POST, WxDomainEnum.CHINA.toString(), TransferApiEnum.TRANSFER_BATCHES.toString(), wxPayV3Bean.getMchId(), getSerialNumber(), null, wxPayV3Bean.getKeyPath(), JSONUtil.toJsonStr(batchTransferModel));
             String body = response.getBody();
             // 根据证书序列号查询对应的证书来验证签名结果
@@ -157,8 +158,8 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements IPayS
                 sendMessage(pay);
                 return AjaxResult.success("转账到微信零钱成功");
             } else {
-                com.alibaba.fastjson2.JSONObject jsonObject =com.alibaba.fastjson2.JSONObject.parseObject(body);
-                throw new ServerException("转账到微信零钱失败:"+jsonObject.getString("message"));
+                com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSONObject.parseObject(body);
+                throw new ServerException("转账到微信零钱失败:" + jsonObject.getString("message"));
             }
         }
         sendMessage(pay);