UsoftFxController规范调整

src/main/java/com/uas/platform/b2b/openapi/controller/UsoftFxController.java

@@ -25,50 +25,50 @@ public class UsoftFxController {
     UsoftFxService usoftFxService;
 
     /**
-     * 根据企业enUU获取当前企业最近三个月（订单时间or验收单时间？）有验收单的数据
-     * @param enUU
-     * @param excludeAcceptItemIds
-     * @param startDate
-     * @param endDate
+     * 根据企业enUU获取当前企业最近三个月（订单时间）有验收单的数据
+     * @param enUU  卖方uu
+     * @param excludeAcceptItemIds  移除的id
+     * @param startDate  起始时间
+     * @param endDate  结束时间
      * @throws UnsupportedEncodingException
      * return 返回有验收单的订单和订单明细
      */
-    @RequestMapping(value = "/orders/withAccepts",method = RequestMethod.GET)
+    @RequestMapping(value = "/orders/withAccepts", method = RequestMethod.GET)
     @ResponseBody
-    public List<FxPurOrder> getPurcAcceptItems(@RequestParam("enUU") Long enUU,@RequestParam(value = "excludeAcceptItemIds",required = false) String excludeAcceptItemIds,
-                                   @RequestParam(value = "startDate",required = false) Long startDate,
-                                   @RequestParam(value = "endDate",required = false) Long endDate) throws UnsupportedEncodingException {
+    public List<FxPurOrder> getPurcAcceptItems(@RequestParam("enUU") Long enUU, @RequestParam(value = "excludeAcceptItemIds", required = false) String excludeAcceptItemIds,
+                                   @RequestParam(value = "startDate", required = false) Long startDate,
+                                   @RequestParam(value = "endDate", required = false) Long endDate) throws UnsupportedEncodingException {
         String acceptItems = null;
         if (!StringUtils.isEmpty(excludeAcceptItemIds)) {
-            acceptItems = URLDecoder.decode(excludeAcceptItemIds,"UTF-8");
+            acceptItems = URLDecoder.decode(excludeAcceptItemIds, "UTF-8");
         }
         List<Long> excludeItemsIds = new ArrayList<>();
         if (!StringUtils.isEmpty(acceptItems)) {
-            Long[] longs = (Long[]) ConvertUtils.convert(acceptItems.split(","),Long.class);
+            Long[] longs = (Long[]) ConvertUtils.convert(acceptItems.split(","), Long.class);
             excludeItemsIds = Arrays.asList(longs);
         }
         Date date = new Date();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
-        calendar.add(Calendar.MONTH,-3);
+        calendar.add(Calendar.MONTH,- 3);
         date = calendar.getTime();
         Date needStartDate = startDate == null ? date : new Date(startDate);
         Date needEndDate = endDate == null ? new Date() : new Date(endDate);
-        List<FxPurOrder> fxPurOrders = usoftFxService.getPurcAccsptItems(enUU,excludeItemsIds,needStartDate,needEndDate);
+        List<FxPurOrder> fxPurOrders = usoftFxService.getPurcAccsptItems(enUU, excludeItemsIds, needStartDate, needEndDate);
         return fxPurOrders;
     }
 
     /**
      * 根据验收单的明细获取对应的验收单数据
-     * @param enUU
-     * @param acceptItemIds
+     * @param enUU 卖方uu
+     * @param acceptItemIds 验收明细id
      * @return
      * @throws UnsupportedEncodingException
      */
-    @RequestMapping(value = "/acceptItems",method = RequestMethod.GET)
+    @RequestMapping(value = "/acceptItems", method = RequestMethod.GET)
     @ResponseBody
     public List<FxPurcAcceptItem> getPurcAcceptByItemIds(@RequestParam("enUU") Long enUU, @RequestParam("acceptItemIds") String acceptItemIds) throws UnsupportedEncodingException{
-        List<Long> ids = Arrays.asList((Long[]) ConvertUtils.convert(acceptItemIds.split(","),Long.class));
-        return usoftFxService.getPurcAcceptByItemIds(enUU,ids);
+        List<Long> ids = Arrays.asList((Long[]) ConvertUtils.convert(acceptItemIds.split(","), Long.class));
+        return usoftFxService.getPurcAcceptByItemIds(enUU, ids);
     }
 }

src/main/java/com/uas/platform/b2b/openapi/service/UsoftFxService.java

@@ -15,14 +15,19 @@ import java.util.List;
 public interface UsoftFxService {
 
     /**
-     * 根据企业enUU获取当前企业最近三个月（订单时间or验收单时间？）有验收单的数据，只返回有验收单的订单和订单明细
+     * 根据企业enUU获取当前企业最近三个月（订单时间）有验收单的数据，只返回有验收单的订单和订单明细
+     * @param enUU  卖方uu
+     * @param excludeItemsIds  移除的明细id
+     * @param needStartDate  开始时间
+     * @param needEndDate  结束时间
+     * @return
      */
     List<FxPurOrder> getPurcAccsptItems(Long enUU, List<Long> excludeItemsIds, Date needStartDate, Date needEndDate);
 
     /**
      * 根据验收单明细ID获取数据
-     * @param enUU
-     * @param ids
+     * @param enUU 卖方uu
+     * @param ids  验收明细id
      */
     List<FxPurcAcceptItem> getPurcAcceptByItemIds(Long enUU, List<Long> ids);
 }

src/main/java/com/uas/platform/b2b/openapi/service/impl/UsoftFxServiceImpl.java

@@ -32,8 +32,8 @@ public class UsoftFxServiceImpl implements UsoftFxService{
      * 根据企业enUU获取当前企业最近三个月（订单时间or验收单时间？）有验收单的数据，只返回有验收单的订单和订单明细
      */
     @Override
-    public List<FxPurOrder> getPurcAccsptItems(Long enUU, List<Long> excludeItemsIds, Date needStartDate,Date needEndDate) {
-        List<PurchaseAcceptItem> acceptItems = acceptItemDao.findPurcAccsptItems(enUU,needStartDate,needEndDate);
+    public List<FxPurOrder> getPurcAccsptItems(Long enUU, List<Long> excludeItemsIds, Date needStartDate, Date needEndDate) {
+        List<PurchaseAcceptItem> acceptItems = acceptItemDao.findPurcAccsptItems(enUU, needStartDate, needEndDate);
         if (!CollectionUtils.isEmpty(excludeItemsIds)) {
             Iterator<PurchaseAcceptItem> item = acceptItems.iterator();
             while (item.hasNext()) {
@@ -63,13 +63,13 @@ public class UsoftFxServiceImpl implements UsoftFxService{
                 boolean exitOrderItem = false;
                 for (PurchaseOrderItem orderItem1 : orderItems) {
                     if (orderItem.getId().equals(orderItem1.getId())) {
-                        exitOrderItem =true;
+                        exitOrderItem = true;
                     }
                 }
                 orderItems.add(orderItem);
                 // 不存在该订单，则新增
                 if (!exit) {
-                    fxPurOrders.add(new FxPurOrder(order,orderItem,needAcceptItem));
+                    fxPurOrders.add(new FxPurOrder(order, orderItem, needAcceptItem));
                 } else {
                     // 存在则找出该订单
                     for (FxPurOrder fxPurOrder : fxPurOrders) {
@@ -78,10 +78,10 @@ public class UsoftFxServiceImpl implements UsoftFxService{
                             if (!exitOrderItem) {
                                 Double orderItemAmout = 0d ;
                                 if (!StringUtils.isEmpty(orderItem.getQty()) && !StringUtils.isEmpty(orderItem.getPrice())) {
-                                    orderItemAmout = orderItem.getQty()*orderItem.getPrice();
+                                    orderItemAmout = orderItem.getQty() * orderItem.getPrice();
                                 }
                                 fxPurOrder.setTotal(fxPurOrder.getTotal() + orderItemAmout);
-                                fxPurOrder.getOrderItems().add(new FxPurcOrderItem(orderItem,needAcceptItem));
+                                fxPurOrder.getOrderItems().add(new FxPurcOrderItem(orderItem, needAcceptItem));
                             } else {
                                 // 存在该明细，找出并把验收明细插入到该明细
                                 for (FxPurcOrderItem fxPurcOrderItem :fxPurOrder.getOrderItems()) {
@@ -104,11 +104,11 @@ public class UsoftFxServiceImpl implements UsoftFxService{
      * @param ids
      */
     @Override
-    public List<FxPurcAcceptItem> getPurcAcceptByItemIds(Long enUU,List<Long> ids){
-        List<PurchaseAcceptItem> acceptItems = acceptItemDao.findPurcAcceptByItemIds(enUU,ids);
+    public List<FxPurcAcceptItem> getPurcAcceptByItemIds(Long enUU, List<Long> ids){
+        List<PurchaseAcceptItem> acceptItems = acceptItemDao.findPurcAcceptByItemIds(enUU, ids);
         List<FxPurcAcceptItem> fxPurcAcceptItems = new ArrayList<>();
         for (PurchaseAcceptItem item : acceptItems) {
-            fxPurcAcceptItems.add(new FxPurcAcceptItem().convert(item,item.getOrderItem(),item.getOrderItem().getOrder()));
+            fxPurcAcceptItems.add(new FxPurcAcceptItem().convert(item, item.getOrderItem(), item.getOrderItem().getOrder()));
         }
         return fxPurcAcceptItems;
     }