xiaoyong931011
2023-08-31 384d14ce56375402eb682bc231220926b74dda04
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -296,49 +296,49 @@
                orderInfo.setPayResult("2");
                break;
            case "2":
                LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
                //订单编号
                laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
                //订单金额,分计
                laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
                List<MallOrderItem> itemsLKL = orderInfo.getItems();
                //商品名称
                if(CollUtil.isEmpty(itemsLKL)){
                    laKaLaCreateOrderReqDate.setOrder_info("商品");
//                LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
//                //订单编号
//                laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
//                //订单金额,分计
//                laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
//                List<MallOrderItem> itemsLKL = orderInfo.getItems();
//                //商品名称
//                if(CollUtil.isEmpty(itemsLKL)){
//                    laKaLaCreateOrderReqDate.setOrder_info("商品");
//                }else{
//                    laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
//                }
//                payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
//                JSONObject parseObj = JSONUtil.parseObj(payResultStr);
//                String code = parseObj.get("code").toString();
//                if (!"true".equals(code)) {
//                    throw new FebsException("跳转收银台失败");
//                }
//
//                orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
//                orderInfo.setPayMethod("拉卡拉支付");
//                orderInfo.setPayResult("2");
                UnipayDto unipayDto = new UnipayDto();
                unipayDto.setAmount(orderInfo.getAmount());
                unipayDto.setFrpCode("ALIPAY_H5");
                unipayDto.setTradeMerchantNo("777184100385821");
                unipayDto.setOrderNo(orderInfo.getOrderNo());
                List<MallOrderItem> items = orderInfo.getItems();
                if(CollUtil.isEmpty(items)){
                    unipayDto.setProductName("商品");
                }else{
                    laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
                    unipayDto.setProductName(items.get(0).getGoodsName());
                }
                payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
                JSONObject parseObj = JSONUtil.parseObj(payResultStr);
                String code = parseObj.get("code").toString();
                if (!"true".equals(code)) {
                    throw new FebsException("跳转收银台失败");
                String unipayStr = unipayService.unipay(unipayDto);
                if("fail" == unipayStr){
                    throw new FebsException("支付失败");
                }else{
                    JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
                    payResultStr = (String) jsonObject.get("r7_TrxNo");
                    rcResult = (String) jsonObject.get("rc_Result");
                }
                orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
                orderInfo.setPayMethod("拉卡拉支付");
                orderInfo.setPayResult("2");
//                UnipayDto unipayDto = new UnipayDto();
//                unipayDto.setAmount(orderInfo.getAmount());
//                unipayDto.setFrpCode("ALIPAY_H5");
//                unipayDto.setTradeMerchantNo("777184100385821");
//                unipayDto.setOrderNo(orderInfo.getOrderNo());
//                List<MallOrderItem> items = orderInfo.getItems();
//                if(CollUtil.isEmpty(items)){
//                    unipayDto.setProductName("商品");
//                }else{
//                    unipayDto.setProductName(items.get(0).getGoodsName());
//                }
//                String unipayStr = unipayService.unipay(unipayDto);
//                if("fail" == unipayStr){
//                    throw new FebsException("支付失败");
//                }else{
//                    JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
//                    payResultStr = (String) jsonObject.get("r7_TrxNo");
//                    rcResult = (String) jsonObject.get("rc_Result");
//                }
//                orderInfo.setPayOrderNo(payResultStr);
//                orderInfo.setPayMethod("支付宝支付");
                orderInfo.setPayOrderNo(payResultStr);
                orderInfo.setPayMethod("支付宝支付");
                break;
            case "3":
                payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
@@ -362,9 +362,9 @@
                mallMqRecord.setCreateTime(orderInfo.getPayTime());
                mallMqRecordMapper.insert(mallMqRecord);
                //发送补贴消息
                agentProducer.sendPerkMoneyMsg(orderInfo.getId());
                //发送代理自动升级消息
                agentProducer.sendAutoLevelUpMsg(member.getId());
//                agentProducer.sendPerkMoneyMsg(orderInfo.getId());
//                //发送代理自动升级消息
//                agentProducer.sendAutoLevelUpMsg(member.getId());
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {
@@ -616,7 +616,7 @@
        MallOrderRefundOperation operation = new MallOrderRefundOperation();
        operation.setOrderId(orderInfo.getId());
        operation.setRefundId(orderRefund.getId());
        operation.setContent(StrUtil.format("用户:{}提交退款申请", member.getName()));
        operation.setContent(StrUtil.format("用户:{}提交退款申请", member.getPhone()));
        mallOrderRefundOperationMapper.insert(operation);
    }
@@ -637,7 +637,7 @@
        MallOrderRefundOperation operation = new MallOrderRefundOperation();
        operation.setOrderId(refundExpressDto.getId());
        operation.setRefundId(orderRefund.getId());
        operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getName(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
        operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getPhone(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
        mallOrderRefundOperationMapper.insert(operation);
    }