修改bug

puzhibing

2023-07-03 84620b593b9034bb28ba23c730392991cdf37a8b

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java

@@ -35,6 +35,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -589,18 +591,31 @@
                    }
                    String merOrderId = jsonObject.getString("merOrderId");
                    String divisionRecordId = jsonObject.getString("parameter1");
                    DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
                    if(divisionRecord.getState() == 2){
                        response.setStatus(200);
                        PrintWriter out = response.getWriter();
                        out.print("OK");
                        out.flush();
                        out.close();
                        return;
                    }
                    divisionRecord.setMerOrderId(merOrderId);
                    divisionRecord.setPayTime(new Date());
                    divisionRecord.setState(2);
                    divisionRecordService.updateById(divisionRecord);

                    //确认收货
                    new Timer().schedule(new TimerTask() {
                        @Override
                        public void run() {
                            DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
                            Receive receive = new Receive();//确认收货
                            receive.setOriginalMerOrderId(merOrderId);
                            receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
                            receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
                            List<ReceiveUser> splitList = new ArrayList<>();
                            ReceiveUser receiveUser = new ReceiveUser();
                            receiveUser.setSplitUserId(divisionRecord.getMerchantNumber());
                            receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
                            receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
                            splitList.add(receiveUser);
                            receive.setSplitList(splitList);
                            TrhRequest<Receive> request1 = new TrhRequest();
@@ -617,7 +632,7 @@
                                logger.warn("确认收货处理中");
                            }
                        }
                    }, 15000);
                    }, 60000);
                    response.setStatus(200);
                    PrintWriter out = response.getWriter();
                    out.print("OK");