更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/PresaleController.java

@@ -223,9 +223,27 @@ public class PresaleController {
     @ApiOperation("远期订单管理--> 注销申请 --> 获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<ForwardCancelApplyResult> queryCancelApply(ForwardCancelApplyParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype().intValue() != SysConstants.SYS_TYPE_MANAGE) {
+            param.setUserid(systemmanager.getAreauserid());
+        }
         return iForwardOrderService.queryCancelApply(param, request);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/queryAuditCancel")
+    @ApiOperation("远期订单管理--> 注销初审/复审 --> 获取列表")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public PageResult<ForwardCancelApplyResult> queryAuditCancel(ForwardCancelApplyParam param, HttpServletRequest request) {
+        return iForwardOrderService.queryCancelApply(param, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/cancelapply")
+    @ApiOperation("远期订单管理--> 注销申请 --> 撤销")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult cancelapply(String cancelid, HttpServletRequest request) {
+        return iForwardOrderService.cancelapply(cancelid, request);
+    }
+
     @RequestMapping(method = RequestMethod.GET, value = "/cancelApplyView")
     @ApiOperation("远期订单管理--> 注销申请 --> 详情")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IForwardOrderService.java

@@ -32,4 +32,6 @@ public interface IForwardOrderService {
     AjaxResult forwardfirstsave(String applyid, Integer applystatus, String firstremark, HttpServletRequest request);
 
     AjaxResult forwardsecondsave(String applyid, Integer applystatus, String secondremark, HttpServletRequest request);
+
+    AjaxResult cancelapply(String cancelid, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/ForwardOrderServiceImpl.java

@@ -99,10 +99,6 @@ public class ForwardOrderServiceImpl implements IForwardOrderService {
 
     @Override
     public PageResult<ForwardCancelApplyResult> queryCancelApply(ForwardCancelApplyParam param, HttpServletRequest request) {
-        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        if (systemmanager.getReletype().intValue() != SysConstants.SYS_TYPE_MANAGE) {
-            param.setUserid(systemmanager.getAreauserid());
-        }
         PageResult<ForwardCancelApplyResult> pageResult = new PageResult<>();
         IPage<ForwardCancelApplyResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<ForwardCancelApplyResult> resultIPage = iCptradePositionapplyMapper.queryCancelApply(page, param);
@@ -330,4 +326,12 @@ public class ForwardOrderServiceImpl implements IForwardOrderService {
 
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
+
+    @Override
+    public AjaxResult cancelapply(String cancelid, HttpServletRequest request) {
+        CptradePositioncancel pa = iCptradePositioncancelMapper.selectOne(new QueryWrapper<CptradePositioncancel>().eq("cancelid",cancelid));
+        pa.setApplystatus(8);
+        iCptradePositioncancelMapper.update(pa,new QueryWrapper<CptradePositioncancel>().eq("cancelid",cancelid));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/MarketRunManageServiceImpl.java

@@ -325,10 +325,10 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             sumVo.setGoodsid(null);
             sumVo.setUsername("汇总");
             sumVo.setBuy_hold_qty(0);
-            sumVo.setBuy_float_pl(0.0);
+            sumVo.setBuy_float_pl(BigDecimal.ZERO);
             sumVo.setSell_hold_qty(0);
-            sumVo.setSell_float_pl(0.0);
-            sumVo.setTotal_float_pl(0.0);
+            sumVo.setSell_float_pl(BigDecimal.ZERO);
+            sumVo.setTotal_float_pl(BigDecimal.ZERO);
 
             Object c = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "1001");
             if (c != null && c.toString().equals("1")) {
@@ -393,13 +393,13 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
 
                     sumVo.setBuy_hold_qty(sumVo.getBuy_hold_qty() + p.getBuy_hold_qty());
                     if (p.getBuy_float_pl() != null) {
-                        sumVo.setBuy_float_pl(sumVo.getBuy_float_pl() + p.getBuy_float_pl());
-                        sumVo.setTotal_float_pl(sumVo.getTotal_float_pl() + p.getBuy_float_pl());
+                        sumVo.setBuy_float_pl(sumVo.getBuy_float_pl().add(p.getBuy_float_pl()));
+                        sumVo.setTotal_float_pl(sumVo.getTotal_float_pl().add(p.getBuy_float_pl()));
                     }
                     sumVo.setSell_hold_qty(sumVo.getSell_hold_qty() + p.getSell_hold_qty());
                     if (p.getSell_float_pl() != null) {
-                        sumVo.setSell_float_pl(sumVo.getSell_float_pl() + p.getSell_float_pl());
-                        sumVo.setTotal_float_pl(sumVo.getTotal_float_pl() + p.getSell_float_pl());
+                        sumVo.setSell_float_pl(sumVo.getSell_float_pl().add(p.getSell_float_pl()));
+                        sumVo.setTotal_float_pl(sumVo.getTotal_float_pl().add(p.getSell_float_pl()));
                     }
                 }
             }
@@ -514,33 +514,33 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             ids.add((long) l.getGOODSID());
             AccPosInfoVo avo = new AccPosInfoVo();
             avo.setGoodsid((long) l.getGOODSID());
-            avo.setMargin(l.getMARGIN());
+            avo.setMargin(BigDecimal.valueOf(l.getMARGIN()));
             avo.setBuy_hold_qty(l.getBUYHOLDQTY());
-            avo.setBuy_hold_value(l.getBUYHOLDVALUE());
-            avo.setTotal_float_pl(0.0);
+            avo.setBuy_hold_value(BigDecimal.valueOf(l.getBUYHOLDVALUE()));
+            avo.setTotal_float_pl(BigDecimal.ZERO);
             if (l.hasBUYFLOATPL()) {
-                avo.setBuy_float_pl(l.getBUYFLOATPL());
-                avo.setTotal_float_pl(l.getBUYFLOATPL());
+                avo.setBuy_float_pl(BigDecimal.valueOf(l.getBUYFLOATPL()));
+                avo.setTotal_float_pl(BigDecimal.valueOf(l.getBUYFLOATPL()));
             }
             avo.setSell_hold_qty(l.getSELLHOLDQTY());
-            avo.setSell_hold_value(l.getSELLHOLDVALUE());
+            avo.setSell_hold_value(BigDecimal.valueOf(l.getSELLHOLDVALUE()));
             if (l.hasSELLFLOATPL()) {
-                avo.setSell_float_pl(l.getSELLFLOATPL());
-                avo.setTotal_float_pl(avo.getTotal_float_pl() + l.getSELLFLOATPL());
+                avo.setSell_float_pl(BigDecimal.valueOf(l.getSELLFLOATPL()));
+                avo.setTotal_float_pl(avo.getTotal_float_pl().add(BigDecimal.valueOf(l.getSELLFLOATPL())));
             }
-            avo.setQuote_price_buy(l.getQUOTEPRICEBUY());
-            avo.setQuote_price_sell(l.getQUOTEPRICESELL());
+            avo.setQuote_price_buy(BigDecimal.valueOf(l.getQUOTEPRICEBUY()));
+            avo.setQuote_price_sell(BigDecimal.valueOf(l.getQUOTEPRICESELL()));
             if (l.hasQUOTEPRICELAST())
-                avo.setQuote_price_last(l.getQUOTEPRICELAST());
+                avo.setQuote_price_last(BigDecimal.valueOf(l.getQUOTEPRICELAST()));
 
             //资金账户
             avo.setAccountid(accountid);
             //用户名称
             avo.setUsername(accountid + "/" + taVo.getLoginid() + "/" + taVo.getUseraccountname());
             //上级机构
-            avo.setParentname(taVo.getParentusername());
+            avo.setParentname(iUseraccountMapper.selectOrganName(taVo.getParentuserid()));
             //占用保证金
-            avo.setMargin((BigDecimal.valueOf(accRiskInfo.getSumMargin()).doubleValue()));
+            avo.setMargin(BigDecimal.valueOf(accRiskInfo.getSumMargin()));
 
             resultList.add(avo);
         }
@@ -575,12 +575,12 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             int goodsDP = dp.get(accPosInfoVo.getGoodsid()) + 1;
             BigDecimal goodsAU = gunits.get(accPosInfoVo.getGoodsid());
             if (accPosInfoVo.getBuy_hold_qty() > 0) {
-                accPosInfoVo.setBuy_avg_price(BigDecimal.valueOf(accPosInfoVo.getBuy_hold_value()).divide(
-                        new BigDecimal(accPosInfoVo.getBuy_hold_qty()).multiply(goodsAU), goodsDP, RoundingMode.HALF_UP).doubleValue());
+                accPosInfoVo.setBuy_avg_price(accPosInfoVo.getBuy_hold_value().divide(
+                        new BigDecimal(accPosInfoVo.getBuy_hold_qty()).multiply(goodsAU), goodsDP, RoundingMode.HALF_UP));
             }
             if (accPosInfoVo.getSell_hold_qty() > 0) {
-                accPosInfoVo.setSell_avg_price(BigDecimal.valueOf(accPosInfoVo.getSell_hold_value()).divide(
-                        new BigDecimal(accPosInfoVo.getSell_hold_qty()).multiply(goodsAU), goodsDP, RoundingMode.HALF_UP).doubleValue());
+                accPosInfoVo.setSell_avg_price(accPosInfoVo.getSell_hold_value().divide(
+                        new BigDecimal(accPosInfoVo.getSell_hold_qty()).multiply(goodsAU), goodsDP, RoundingMode.HALF_UP));
             }
         }
         return resultList;

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/NoticeServiceImpl.java

@@ -75,8 +75,8 @@ public class NoticeServiceImpl implements INoticeService {
         BeanUtils.copyProperties(param, noticeMsg);
         noticeMsg.setCreatorid(systemmanager.getAutoid());
         noticeMsg.setCreatetime(new Date());
-        noticeMsg.setEndtime(DateTimeUtils.parseDate(param.getEndtime()));
-        noticeMsg.setScheduletime(DateTimeUtils.parseDate(param.getScheduletime()));
+        noticeMsg.setEndtime(DateTimeUtils.parseDatetime(param.getEndtime()));
+        noticeMsg.setScheduletime(DateTimeUtils.parseDatetime(param.getScheduletime()));
         noticeMsg.setPublisher(systemmanager.getAreauserid().toString());
         noticeMsg.setSentstatus(0);
         noticeMsg.setIsforcedisplay(0);

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/AccPosInfoVo.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Builder
 @Data
 @AllArgsConstructor
@@ -20,43 +22,43 @@ public class AccPosInfoVo {
     private Long goodsid;
 
     @ApiModelProperty(value = "占用保证金")
-    private Double margin;
+    private BigDecimal margin;
 
     @ApiModelProperty(value = "持仓头寸(买)")
     private Integer buy_hold_qty;
 
     @ApiModelProperty(value = "持仓金额(买)")
-    private Double buy_hold_value;
+    private BigDecimal buy_hold_value;
 
     @ApiModelProperty(value = "持仓均价(买)")
-    private Double buy_avg_price;
+    private BigDecimal buy_avg_price;
 
     @ApiModelProperty(value = "浮动盈亏(买)")
-    private Double buy_float_pl;
+    private BigDecimal buy_float_pl;
 
     @ApiModelProperty(value = "持仓头寸(卖)")
     private Integer sell_hold_qty;
 
     @ApiModelProperty(value = "持仓金额(卖)")
-    private Double sell_hold_value;
+    private BigDecimal sell_hold_value;
 
     @ApiModelProperty(value = "持仓均价(卖)")
-    private Double sell_avg_price;
+    private BigDecimal sell_avg_price;
 
     @ApiModelProperty(value = "浮动盈亏(卖)")
-    private Double sell_float_pl;
+    private BigDecimal sell_float_pl;
 
     @ApiModelProperty(value = "浮动盈亏(总)")
-    private Double total_float_pl;
+    private BigDecimal total_float_pl;
 
     @ApiModelProperty(value = "实时行情(买)")
-    private Double quote_price_buy;
+    private BigDecimal quote_price_buy;
 
     @ApiModelProperty(value = "实时行情(卖)")
-    private Double quote_price_sell;
+    private BigDecimal quote_price_sell;
 
     @ApiModelProperty(value = "实时行情")
-    private Double quote_price_last;
+    private BigDecimal quote_price_last;
 
     private String goodsname;