订单类型修改

src/main/java/com/mmc/oms/common/util/CodeUtil.java

@@ -220,7 +220,7 @@ public class CodeUtil {
         return "RN" + CodeUtil.getRandomNum(8);
     }
 
-    public static String uavOrderCode(Long id) {
+    public static String uavOrderCode() {
         StringBuffer sb = new StringBuffer();
         sb.append("UD");
         sb.append(TDateUtil.getCurrentDateByType("yyyyMMddHHmmss"));

src/main/java/com/mmc/oms/common/util/KdnExpressUtil.java

@@ -67,7 +67,7 @@ public class KdnExpressUtil {
         return KdnExpressUtil.orderOnlineByJson("", exCode, logisticCode);
     }
 
-    public static String monitorPush(String port, Long orderId, String shipperCode, String logisticCode, String phone) throws Exception {
+    public static String monitorPush(String port, Integer orderId, String shipperCode, String logisticCode, String phone) throws Exception {
         String callbackTag = port + "-" + orderId;
         String customerName = phone.substring(phone.length() - 4, phone.length());
         return kdApiSearchMonitorPush(callbackTag, shipperCode, logisticCode, customerName);

src/main/java/com/mmc/oms/controller/mall/AMOrderController.java

@@ -69,7 +69,7 @@ public class AMOrderController extends BaseController {
 	@ApiOperation(value = "取消订单", hidden = true)
 	@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
 	@GetMapping("closeOrder")
-	public ResultBody closeOrder(@RequestParam Long orderId, @RequestParam(required = false) String shutReason,
+	public ResultBody closeOrder(@RequestParam Integer orderId, @RequestParam(required = false) String shutReason,
                                  HttpServletRequest request) {
 		return mallOrderService.closeOrder(orderId, shutReason, this.getCurrentAccount(request));
 	}
@@ -84,7 +84,7 @@ public class AMOrderController extends BaseController {
 	@ApiOperation(value = "发送服务消息通知", hidden = true)
 	@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
 	@GetMapping("sendOrderStatusChangeMsg")
-	public void sendOrderStatusChangeMsg(@RequestParam Long orderId) {
+	public void sendOrderStatusChangeMsg(@RequestParam Integer orderId) {
 		mallOrderService.sendOrderStatusChangeMsg(orderId);
 	}
 }

src/main/java/com/mmc/oms/controller/mall/AppMallOrderController.java

@@ -54,21 +54,21 @@ public class AppMallOrderController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @ApiIgnore
     @GetMapping("getShareOrderStatus")
-    public ResultBody getShareOrderStatus(@RequestParam @ApiParam(value = "订单id") Long orderId) {
+    public ResultBody getShareOrderStatus(@RequestParam @ApiParam(value = "订单id") Integer orderId) {
         return appMallOrderService.getShareOrderStatus(orderId);
     }
 
     @ApiOperation(value = "订单信息--接受共享", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("acceptShare")
-    public ResultBody acceptShare(@RequestParam @ApiParam(value = "订单id") Long orderId, @RequestParam @ApiParam(value = "分享人id") Integer shareId) {
+    public ResultBody acceptShare(@RequestParam @ApiParam(value = "订单id") Integer orderId, @RequestParam @ApiParam(value = "分享人id") Integer shareId) {
         return appMallOrderService.acceptShare(orderId,shareId);
     }
 
     @ApiOperation(value = "退回合同", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("returnContractById")
-    public ResultBody returnContractById(@RequestParam @ApiParam(value = "订单id") Long orderId) {
+    public ResultBody returnContractById(@RequestParam @ApiParam(value = "订单id") Integer orderId) {
         return appMallOrderService.returnContractById(orderId);
     }
 
@@ -89,7 +89,7 @@ public class AppMallOrderController extends BaseController {
     @ApiOperation(value = "订单详情V1.0.0", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class) })
     @GetMapping("getMallOrderDetailById")
-    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
+    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Integer orderId, HttpServletRequest request) {
         return ResultBody.success(appMallOrderService.getMallOrderDetailById(orderId,this.getCurrentAccount(request)));
     }
 }

src/main/java/com/mmc/oms/controller/mall/MallOrderController.java

@@ -62,20 +62,20 @@ public class MallOrderController extends BaseController {
 	@ApiOperation(value = "订单-查看支付凭证", hidden = true)
 	@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = OrderPayDTO.class) })
 	@GetMapping("getOrderPay")
-	public ResultBody getOrderPay(@RequestParam Long orderId, @ApiParam("凭证类型(留空则全部)：0全款 1预付款 2尾款 3验收单") @RequestParam(required = false) Integer payType, HttpServletRequest request) {
+	public ResultBody getOrderPay(@RequestParam Integer orderId, @ApiParam("凭证类型(留空则全部)：0全款 1预付款 2尾款 3验收单") @RequestParam(required = false) Integer payType, HttpServletRequest request) {
 		return ResultBody.success(mallOrderService.listOrderPayInfo(orderId, payType, this.getCurrentAccount(request)));
 	}
 
 	@ApiOperation(value = "修改订单的付款期限", hidden = true)
 	@GetMapping("updateMallOrder")
 	@ApiIgnore
-	public ResultBody updateMallOrder(@RequestParam Long orderId, @RequestParam Date singerTime){
+	public ResultBody updateMallOrder(@RequestParam Integer orderId, @RequestParam Date singerTime){
 		return mallOrderService.updateMallOrder(orderId,singerTime);
 	}
 
 	@ApiOperation(value = "修改订单的合同状态", hidden = true)
 	@GetMapping("updateStatusMallOrder")
-	public ResultBody updateStatusMallOrder(@RequestParam Long orderId, @RequestParam Integer signStatus){
+	public ResultBody updateStatusMallOrder(@RequestParam Integer orderId, @RequestParam Integer signStatus){
 		return mallOrderService.updateStatusMallOrder(orderId,signStatus);
 	}
 
@@ -87,7 +87,7 @@ public class MallOrderController extends BaseController {
 
 	@ApiOperation(value = "测试物流订阅", hidden = true)
 	@GetMapping("testCallbackExpressInfo")
-	public ResultBody testCallbackExpressInfo(@RequestParam String port, @RequestParam Long orderId, @RequestParam String shipperCode,
+	public ResultBody testCallbackExpressInfo(@RequestParam String port, @RequestParam Integer orderId, @RequestParam String shipperCode,
                                               @RequestParam String logisticCode, @RequestParam String phone) throws Exception {
 		return kdnExpService.testCallbackExpressInfo(port, orderId, shipperCode, logisticCode, phone);
 	}

src/main/java/com/mmc/oms/controller/mall/PMOrderController.java

@@ -74,7 +74,7 @@ public class PMOrderController extends BaseController {
 	@ApiOperation(value = "确认库存", hidden = true)
 	@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
 	@GetMapping("confirmInventory")
-	public ResultBody confirmInventory(@RequestParam Long orderId, HttpServletRequest request) {
+	public ResultBody confirmInventory(@RequestParam Integer orderId, HttpServletRequest request) {
 		return mallOrderService.confirmInventory(orderId, this.getCurrentAccount(request));
 	}
 

src/main/java/com/mmc/oms/controller/mall/PMOrderControllerVerOne.java

@@ -58,7 +58,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "v1.0.0订单管理-详情（改版后）")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class) })
     @GetMapping("getMallOrderDetailById")
-    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
+    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Integer orderId, HttpServletRequest request) {
         return ResultBody.success(mallOrderService.getMallOrderDetailById(orderId,this.getCurrentAccount(request), request.getHeader("token")));
     }
 
@@ -74,7 +74,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "订单管理-修改订单备注（管理员专属）", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("updateMallOrderRemark")
-    public ResultBody updateMallOrderRemark(@RequestParam Long orderId, @RequestParam(required = false) String remark, HttpServletRequest request) {
+    public ResultBody updateMallOrderRemark(@RequestParam Integer orderId, @RequestParam(required = false) String remark, HttpServletRequest request) {
         return mallOrderService.updateMallOrderRemark(orderId, remark);
     }
 
@@ -95,7 +95,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "批量生产导出数据", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("/exportMultiSheet")
-    public void exportMultiSheet(HttpServletResponse response, @ApiParam("订单id") @RequestBody List<Long> orderIds) throws IOException {
+    public void exportMultiSheet(HttpServletResponse response, @ApiParam("订单id") @RequestBody List<Integer> orderIds) throws IOException {
         mallOrderService.exportMultiSheet(response,orderIds);
     }
 
@@ -109,7 +109,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "订单管理-运营数据导出（改版后）", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("operationalDataExport")
-    public void operationalDataExport(@ApiParam("订单id") @RequestBody List<Long> orderIds, HttpServletResponse response, HttpServletRequest request) throws IOException {
+    public void operationalDataExport(@ApiParam("订单id") @RequestBody List<Integer> orderIds, HttpServletResponse response, HttpServletRequest request) throws IOException {
         mallOrderService.operationalDataExport(orderIds,response,this.getCurrentAccount(request));
     }
 
@@ -140,7 +140,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("feignOrderUseCoupon")
     @ApiIgnore
-    public ResultBody feignOrderUseCoupon(@RequestParam List<Long> orderId){
+    public ResultBody feignOrderUseCoupon(@RequestParam List<Integer> orderId){
         return mallOrderService.feignOrderUseCoupon(orderId);
     }
 
@@ -154,7 +154,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "分配运营", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("allocateOperation")
-    public ResultBody allocateOperation(@ApiParam(value = "订单id")@RequestParam(value = "orderId") Long orderId,
+    public ResultBody allocateOperation(@ApiParam(value = "订单id")@RequestParam(value = "orderId") Integer orderId,
                                         @ApiParam(value = "运营id") @RequestParam(value = "operationId") Integer operationId) {
         return mallOrderService.allocateOperation(orderId,operationId);
     }
@@ -162,7 +162,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "订单关闭-根据id", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @GetMapping("deleteById")
-    public ResultBody closeMallOrder(@RequestParam Long id, HttpServletRequest request) {
+    public ResultBody closeMallOrder(@RequestParam Integer id, HttpServletRequest request) {
         return mallOrderService.closeMallOrder(id,this.getCurrentAccount(request));
     }
 

src/main/java/com/mmc/oms/dao/mall/AppMallOrderDao.java

@@ -22,11 +22,11 @@ public interface AppMallOrderDao {
 
     void batchInsertOrderGoodsIndstProdListDO(List<OrderGoodsIndstProdListDO> orderGoodsIndstProdListDOS);
 
-    List<MallOrderSimpleDO> listMallOrderSkuSpec(List<Long> orderIds);
+    List<MallOrderSimpleDO> listMallOrderSkuSpec(List<Integer> orderIds);
 
-    void updateOrderShareInfo(Long orderId, Integer shareId);
+    void updateOrderShareInfo(Integer orderId, Integer shareId);
 
     void batchInsertOrderCoupon(List<OrderCouponDO> orderCouponDOS);
 
-    List<OrderCouponDO> listOrderCoupon(Long orderId);
+    List<OrderCouponDO> listOrderCoupon(Integer orderId);
 }

src/main/java/com/mmc/oms/dao/mall/MallOrderDao.java

@@ -34,13 +34,13 @@ public interface MallOrderDao {
 //
 //	List<OrderGoodsDO> listOrderGoodsInfo(Long orderId);
 
-	MallOrderDO getMallOrderInfo(Long orderId);
+	MallOrderDO getMallOrderInfo(Integer orderId);
 
 	/**
 	 * 获取订单付款期限，和状态(未付款)
 	 * @param orderId
 	 */
-	List<MallOrderDO> getMallOrderCreditPeriod(List<Long> orderId);
+	List<MallOrderDO> getMallOrderCreditPeriod(List<Integer> orderId);
 
 	Integer updateMallOrder(MallOrderDO order);
 
@@ -48,13 +48,13 @@ public interface MallOrderDao {
 
 	int updateOrderPay(OrderPayDO pay);
 
-	OrderPayDO getOrderPayInfo(Long orderId, Integer payType);
+	OrderPayDO getOrderPayInfo(Integer orderId, Integer payType);
 
 	List<MallOrderStatusDO> listOrderStatus();
 
 	int insertOrderExpress(MallOrderExpressDO express);
 
-	MallOrderExpressDO getOrderExpress(Long orderId);
+	MallOrderExpressDO getOrderExpress(Integer orderId);
 
 	int countPagePmOrder(MallOrderQO param);
 
@@ -62,9 +62,9 @@ public interface MallOrderDao {
 
 	int batchInsertOrderService(List<OrderServiceDO> list);
 
-	List<OrderServiceDO> listOrderService(Long orderId);
+	List<OrderServiceDO> listOrderService(Integer orderId);
 
-	List<OrderPayDO> listOrderPay(Long orderId, Integer payType);
+	List<OrderPayDO> listOrderPay(Integer orderId, Integer payType);
 
 	int countPMOrderConfirm(Integer statusCode);
 	
@@ -82,7 +82,7 @@ public interface MallOrderDao {
 
 	Integer updateMallOrderAddreId(@Param("mallOrderId") Long mallOrderId, @Param("userAddressId") Integer userAddressId);
 
-    void updateMallOrderRemark(Long mallOrderId, String remark);
+    void updateMallOrderRemark(Integer mallOrderId, String remark);
 
 	/**
 	 * 商城订单列表
@@ -90,13 +90,13 @@ public interface MallOrderDao {
 	 * @param orderIds 订单id
 	 * @return {@link List}<{@link MallOrderDO}>
 	 */
-	List<MallOrderDO> listMallOrder(List<Long> orderIds);
+	List<MallOrderDO> listMallOrder(List<Integer> orderIds);
 
 	List<MallOrderDO> getMallOrderByStatus(@Param("code") Integer code);
 
 	void saveOrderPay(OrderPayDO upPay);
 
-	Integer countOrderForCouponUse(@Param("orderIds") List<Long> orderIds, Integer orderStatus);
+	Integer countOrderForCouponUse(@Param("orderIds") List<Integer> orderIds, Integer orderStatus);
 
 	MallOrderDO getOrderInfoByOrderNo(String orderNo);
 
@@ -106,7 +106,7 @@ public interface MallOrderDao {
 
 	int countListFinishMallOrder(OrderBonusQO orderBonusQO);
 
-	int countPageOrderInfo(List<Long> orderIds);
+	int countPageOrderInfo(List<Integer> orderIds);
 
-	List<MallOrderDO> listOperationalExportOrder(List<Long> orderIds);
+	List<MallOrderDO> listOperationalExportOrder(List<Integer> orderIds);
 }

src/main/java/com/mmc/oms/dao/mall/OrderExpressDao.java

@@ -21,5 +21,5 @@ public interface OrderExpressDao {
 
     void updateOrderExpress(MallOrderExpressDO orderExpressDO);
 
-    List<Long> listReceivedOrderIds();
+    List<Integer> listReceivedOrderIds();
 }

src/main/java/com/mmc/oms/dao/mall/OrderGoodsIndstDao.java

@@ -20,9 +20,9 @@ import java.util.List;
 @Mapper
 public interface OrderGoodsIndstDao  {
 
-    List<OrderGoodsIndstProdListBO> getProductInfoByMallId(@Param("orderId") Long orderId);
+    List<OrderGoodsIndstProdListBO> getProductInfoByMallId(@Param("orderId") Integer orderId);
 
-    List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Long> mallOrderIds);
+    List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Integer> mallOrderIds);
 
-    List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Long orderId);
+    List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Integer orderId);
 }

src/main/java/com/mmc/oms/dao/mall/OrderGoodsProdDao.java

@@ -20,9 +20,9 @@ import java.util.List;
 @Mapper
 public interface OrderGoodsProdDao {
 
-    List<OrderGoodsProdDetailBO> getProductInfoByMallId(@Param("orderId") Long orderId);
+    List<OrderGoodsProdDetailBO> getProductInfoByMallId(@Param("orderId") Integer orderId);
 
-    List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Long> mallOrderIds);
+    List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Integer> mallOrderIds);
 
-    List<OrderGoodsProdDetailDO> listPMallOrderProdList(Long orderId);
+    List<OrderGoodsProdDetailDO> listPMallOrderProdList(Integer orderId);
 }

src/main/java/com/mmc/oms/entity/mall/MallOrderDO.java

@@ -26,7 +26,7 @@ public class MallOrderDO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("id")
-	private Long id;
+	private Integer id;
 
 	@ApiModelProperty("pid")
 	private Integer pid;

src/main/java/com/mmc/oms/entity/mall/MallOrderExpressDO.java

@@ -21,7 +21,7 @@ public class MallOrderExpressDO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private Integer id;
-	private Long orderId;
+	private Integer orderId;
 	private String sendExpNo;
 	private String sendExpCode;
 	private String takeName;

src/main/java/com/mmc/oms/entity/mall/MallOrderSimpleDO.java

@@ -20,7 +20,7 @@ import java.util.List;
 @ApiModel("商城订单simple信息")
 public class MallOrderSimpleDO implements Serializable {
     private static final long serialVersionUID = 7783643628653457384L;
-    private Long id;
+    private Integer id;
     private Integer userAccountId;
     private BigDecimal orderAmount;
     private List<OrderGoodsCommonDO> orderGoodsCommonDOS;

src/main/java/com/mmc/oms/entity/mall/OrderGoodsIndstDO.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class OrderGoodsIndstDO implements Serializable {
     private static final long serialVersionUID = -3279631619974911234L;
     private Integer id;
-    private Long orderId;
+    private Integer orderId;
     private Integer mallIndstShopCarId;
     private Integer goodsInfoId;
     private Integer directoryId;

src/main/java/com/mmc/oms/entity/mall/OrderGoodsProdDO.java

@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 public class OrderGoodsProdDO implements Serializable {
     private static final long serialVersionUID = 698431955075119489L;
     private Integer id;
-    private Long orderId;
+    private Integer orderId;
     private Integer mallProdShopCarId;
     private Integer goodsInfoId;
     private Integer directoryId;

src/main/java/com/mmc/oms/entity/mall/OrderPayDO.java

@@ -21,7 +21,7 @@ import java.util.Date;
 public class OrderPayDO implements Serializable {
 	private static final long serialVersionUID = -2577204623479240233L;
 	private Integer id;
-	private Long orderId;
+	private Integer orderId;
 	private Integer userAccountId;
 	private Integer payType;
 	private Integer payStatus;

src/main/java/com/mmc/oms/entity/mall/OrderServiceDO.java

@@ -20,13 +20,13 @@ import java.util.Date;
 public class OrderServiceDO implements Serializable {
 	private static final long serialVersionUID = -2938941346648852627L;
 	private Integer id;
-	private Long orderId;
+	private Integer orderId;
 	private Integer goodsInfoId;
 	private String serviceName;
 	private String remark;
 	private Date createTime;
 
-	public OrderServiceDO(GoodsServiceDTO d, Long orderId) {
+	public OrderServiceDO(GoodsServiceDTO d, Integer orderId) {
 		this.orderId = orderId;
 		this.goodsInfoId = d.getGoodsInfoId();
 		this.serviceName = d.getServiceName();

src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java

@@ -38,7 +38,7 @@ public class AuthSignatureFilter implements AuthFilter {
     /**
      * 无需登录白名单
      */
-    private static final String[] IGNORE_URLS = {"/oms/swagger-resources", "/oms/v2/api-docs", "/oms/doc.html"};
+    private static final String[] IGNORE_URLS = {"/oms/swagger-resources", "/oms/v2/api-docs", "/oms/doc.html", "/oms/mallorder/listStatus"};
 
     /*无需加密狗无需登录白名单*/
     private static final String[] USE_KEY = {"/oms/account/loginByUsbKey"};

src/main/java/com/mmc/oms/model/dto/mall/MallOrderDTO.java

@@ -29,7 +29,7 @@ public class MallOrderDTO implements Serializable {
 	private static final long serialVersionUID = -5495994390870097181L;
 
 	@ApiModelProperty("id")
-	private Long id;
+	private Integer id;
 
 	@ApiModelProperty("订单编号")
 	private String orderNo;

src/main/java/com/mmc/oms/model/dto/mall/MallOrderExpressDTO.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 public class MallOrderExpressDTO implements Serializable {
     private static final long serialVersionUID = 6804508364845777867L;
     @ApiModelProperty(value = "orderId")
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "发货-快递公司编码")
     private String sendExpNo;
     @ApiModelProperty(value = "发货-快递单号")

src/main/java/com/mmc/oms/model/dto/mall/MallOrderFinishDTO.java

@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 public class MallOrderFinishDTO implements Serializable {
     private static final long serialVersionUID = 4577011678089794859L;
     @ApiModelProperty("订单id")
-    private Long orderId;
+    private Integer orderId;
 
     @ApiModelProperty("订单编号")
     private String orderNo;

src/main/java/com/mmc/oms/model/dto/mall/MallOrderPageDTO.java

@@ -26,7 +26,7 @@ import java.util.List;
 public class MallOrderPageDTO implements Serializable {
     private static final long serialVersionUID = 56353980620113181L;
     @ApiModelProperty("id")
-    private Long id;
+    private Integer id;
 
     @ApiModelProperty("订单编号")
     private String orderNo;

src/main/java/com/mmc/oms/model/dto/mall/OrderGoodsIndstDTO.java

@@ -26,7 +26,7 @@ public class OrderGoodsIndstDTO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;
     @ApiModelProperty(value = "订单id")
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "购物车id")
     private Integer mallIndstShopCarId;
     @ApiModelProperty(value = "商品id")

src/main/java/com/mmc/oms/model/dto/mall/OrderGoodsProdDTO.java

@@ -26,7 +26,7 @@ public class OrderGoodsProdDTO implements Serializable {
     @ApiModelProperty(value = "orderGoodsProdId")
     private Integer id;
     @ApiModelProperty(value = "订单id")
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "产品购物车id")
     private Integer mallProdShopCarId;
     @ApiModelProperty(value = "商品id")

src/main/java/com/mmc/oms/model/dto/mall/OrderPayDTO.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class OrderPayDTO implements Serializable {
 	private static final long serialVersionUID = -3966470399037847912L;
 	@ApiModelProperty(value = "orderId")
-	private Long orderId;
+	private Integer orderId;
 	@ApiModelProperty(value = "凭证类型：0全款 1预付款 2尾款")
 	private Integer payType;
 	@ApiModelProperty(value = "支付备注")

src/main/java/com/mmc/oms/model/dto/mall/OrderServiceDTO.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 @ApiModel(value = "com.mmc.csf.mall.dto.OrderServiceDTO", description = "订单商品信息DTO")
 public class OrderServiceDTO implements Serializable {
 	private static final long serialVersionUID = 3384622935297961674L;
-	private Long orderId;
+	private Integer orderId;
 	private Integer goodsInfoId;
 	@ApiModelProperty(value = "服务名")
 	private String serviceName;

src/main/java/com/mmc/oms/model/dto/mall/UavContractInfoDTO.java

@@ -16,7 +16,7 @@ public class UavContractInfoDTO implements Serializable {
     private static final long serialVersionUID = 8595958456591915448L;
     private Integer id;
     private Integer userAccountId;
-    private Long mallOrderId;
+    private Integer mallOrderId;
     private String contractTitle;
     @ApiModelProperty(value = "状态:（0:等待用户签署、1：用户签署失败、2：等待甲方签署(用户签署成功) 3：用户签署失败、4：甲方签署成功、5：已完成")
     private Integer signStatus;

src/main/java/com/mmc/oms/model/vo/mall/ConfirmAfPayVO.java

@@ -19,7 +19,7 @@ public class ConfirmAfPayVO implements Serializable {
 
     @ApiModelProperty(value = "订单id",required = true)
     @NotNull
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "审核状态：0拒绝/1通过",required = true)
     @NotNull
     private Integer checkStatus;

src/main/java/com/mmc/oms/model/vo/mall/MallOrderExpressVO.java

@@ -20,7 +20,7 @@ public class MallOrderExpressVO implements Serializable {
     private static final long serialVersionUID = 4364047174162933119L;
     @ApiModelProperty(value = "orderId")
     @NotNull
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "物流公司代号")
     @NotNull
     private String sendExpCode;

src/main/java/com/mmc/oms/model/vo/mall/MallOrderVO.java

@@ -26,7 +26,7 @@ public class MallOrderVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "订单id")
-    private Long id;
+    private Integer id;
 
     @ApiModelProperty(value = "0全款购买 1分期付款")
     private Integer payMethod;

src/main/java/com/mmc/oms/model/vo/mall/OrderPayVO.java

@@ -24,7 +24,7 @@ public class OrderPayVO implements Serializable {
     private static final long serialVersionUID = -7118568598001208480L;
     @ApiModelProperty(value = "orderId")
     @NotNull(message = "订单ID不能为空", groups = { Auto.class, Confirm.class })
-    private Long orderId;
+    private Integer orderId;
     @ApiModelProperty(value = "支付凭证-图片")
     @NotNull(message = "支付凭证-图片不能为空", groups = { Confirm.class })
     private List<String> vouchr;

src/main/java/com/mmc/oms/service/mall/AppMallOrderService.java

@@ -34,7 +34,7 @@ public interface AppMallOrderService {
      * @param orderId 订单id
      * @return {@link ResultBody}
      */
-    ResultBody getShareOrderStatus(Long orderId);
+    ResultBody getShareOrderStatus(Integer orderId);
 
     /**
      * 接受分享
@@ -43,11 +43,11 @@ public interface AppMallOrderService {
      * @param shareId 共享id
      * @return {@link ResultBody}
      */
-    ResultBody acceptShare(Long orderId, Integer shareId);
+    ResultBody acceptShare(Integer orderId, Integer shareId);
 
     CountShowTypeDTO countListPage(BaseAccountDTO currentAccount);
 
-    ResultBody returnContractById(Long orderId);
+    ResultBody returnContractById(Integer orderId);
 
     /**
      * v1.0.0确认订单
@@ -73,5 +73,5 @@ public interface AppMallOrderService {
      * @param currentAccount
      * @return
      */
-    MallOrderDTO getMallOrderDetailById(Long orderId, BaseAccountDTO currentAccount);
+    MallOrderDTO getMallOrderDetailById(Integer orderId, BaseAccountDTO currentAccount);
 }

src/main/java/com/mmc/oms/service/mall/KdnExpService.java

@@ -17,5 +17,5 @@ public interface KdnExpService {
 
     KDNCallBackResponse callbackExpressInfo(Map<String, Object> map);
 
-    ResultBody testCallbackExpressInfo(String port, Long orderId, String shipperCode, String logisticCode, String phone) throws Exception;
+    ResultBody testCallbackExpressInfo(String port, Integer orderId, String shipperCode, String logisticCode, String phone) throws Exception;
 }

src/main/java/com/mmc/oms/service/mall/MallOrderService.java

@@ -51,9 +51,9 @@ public interface MallOrderService {
 	 * @param cuser
 	 * @return
 	 */
-	ResultBody confirmCost(Long orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser);// 平台确认收款
+	ResultBody confirmCost(Integer orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser);// 平台确认收款
 
-	ResultBody confirmAfPay(Long orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser);
+	ResultBody confirmAfPay(Integer orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser);
 
 	/**
 	 * 平台确认库存-已确认收款（待确认库存）》已确认库存（待发货）
@@ -62,7 +62,7 @@ public interface MallOrderService {
 	 * @param cuser
 	 * @return
 	 */
-	ResultBody confirmInventory(Long orderId, BaseAccountDTO cuser);// 平台确认库存
+	ResultBody confirmInventory(Integer orderId, BaseAccountDTO cuser);// 平台确认库存
 
 	/**
 	 * 买家确认收货-已发货（待收货）》已收货（待订单完成）
@@ -75,7 +75,7 @@ public interface MallOrderService {
 	/**
 	 * 取消订单
 	 */
-	ResultBody closeOrder(Long orderId, String shutReason, BaseAccountDTO cuser);
+	ResultBody closeOrder(Integer orderId, String shutReason, BaseAccountDTO cuser);
 
 	/**
 	 * 订单详情
@@ -87,13 +87,13 @@ public interface MallOrderService {
 	 */
 //	MallOrderDTO appOrderDetail(Long orderId, BaseAccountDTO cuser);
 
-	List<OrderPayDTO> listOrderPayInfo(Long orderId, Integer payType, BaseAccountDTO cuser);
+	List<OrderPayDTO> listOrderPayInfo(Integer orderId, Integer payType, BaseAccountDTO cuser);
 
 	int countMenuRedPoint(BaseAccountDTO cuser);
 
 	ResultBody confirmOrderVerOne(ConfirmOrderVO confirmOrderVO, BaseAccountDTO currentAccount);
 
-	void sendOrderStatusChangeMsg(Long mallOrderId);
+	void sendOrderStatusChangeMsg(Integer mallOrderId);
 
 	/**
 	 * 关闭订单
@@ -101,11 +101,11 @@ public interface MallOrderService {
 	 * @param baseAccountDTO
 	 * @return
 	 */
-	ResultBody closeMallOrder(Long id, BaseAccountDTO baseAccountDTO);
+	ResultBody closeMallOrder(Integer id, BaseAccountDTO baseAccountDTO);
 
-	ResultBody updateMallOrder(Long orderId, Date singerTime);
+	ResultBody updateMallOrder(Integer orderId, Date singerTime);
 
-    ResultBody allocateOperation(Long orderId , Integer operationId);
+    ResultBody allocateOperation(Integer orderId , Integer operationId);
 
 	ResultBody afterPayAndCheck(List<OrderPayVO> param, BaseAccountDTO currentAccount);
 
@@ -115,7 +115,7 @@ public interface MallOrderService {
 
 	ResultBody confirmCostVerOne(ConfirmAfPayVO confirmPay, BaseAccountDTO currentAccount);
 
-	ResultBody updateStatusMallOrder(Long orderId, Integer signStatus);
+	ResultBody updateStatusMallOrder(Integer orderId, Integer signStatus);
 
 	void mallOrderCreditPeriodTask();
 
@@ -126,21 +126,21 @@ public interface MallOrderService {
 
 	void listPageManagerExportVerOne(MallOrderQO param, HttpServletResponse response, BaseAccountDTO currentAccount, String token);
 
-	MallOrderDTO getMallOrderDetailById(Long orderId, BaseAccountDTO currentAccount, String token);
+	MallOrderDTO getMallOrderDetailById(Integer orderId, BaseAccountDTO currentAccount, String token);
 
-	ResultBody updateMallOrderRemark(Long orderId, String remark);
+	ResultBody updateMallOrderRemark(Integer orderId, String remark);
 
 	ResultBody confirmOrderNew(ConfirmOrderNewVO confirmOrderNewVO, BaseAccountDTO currentAccount);
 
 	ResultBody sendOrderGoodsNew(MallOrderExpressVO param, BaseAccountDTO currentAccount) throws Exception;
 
-	void exportMultiSheet(HttpServletResponse response, List<Long> orderIds) throws IOException;
+	void exportMultiSheet(HttpServletResponse response, List<Integer> orderIds) throws IOException;
 
 	void listOperationalDataExport(MallOrderQO param, HttpServletResponse response, BaseAccountDTO currentAccount, String token) throws IOException;
 
-	ResultBody feignOrderUseCoupon(List<Long> orderIds);
+	ResultBody feignOrderUseCoupon(List<Integer> orderIds);
 
     ResultBody getOrderInfoByOrderNo(String orderNo);
 
-	void operationalDataExport(List<Long> orderIds, HttpServletResponse response, BaseAccountDTO currentAccount) throws IOException;
+	void operationalDataExport(List<Integer> orderIds, HttpServletResponse response, BaseAccountDTO currentAccount) throws IOException;
 }

src/main/java/com/mmc/oms/service/mall/OrderGoodsIndstService.java

@@ -20,9 +20,9 @@ public interface OrderGoodsIndstService {
     /**
      * 根据订单id，查询产品信息和产品规格
      */
-    List<OrderGoodsIndstProdListBO> getProductInfoByMallId(Long orderId);
+    List<OrderGoodsIndstProdListBO> getProductInfoByMallId(Integer orderId);
 
-    List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Long> mallOrderIds);
+    List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Integer> mallOrderIds);
 
-    List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Long orderId);
+    List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Integer orderId);
 }

src/main/java/com/mmc/oms/service/mall/OrderGoodsProdService.java

@@ -18,9 +18,9 @@ import java.util.List;
  */
 public interface OrderGoodsProdService {
 
-    List<OrderGoodsProdDetailBO> getProductInfoByMallId(Long orderId);
+    List<OrderGoodsProdDetailBO> getProductInfoByMallId(Integer orderId);
 
-    List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Long> mallOrderIds);
+    List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Integer> mallOrderIds);
 
-    List<OrderGoodsProdDetailDO> listPMallOrderProdList(Long orderId);
+    List<OrderGoodsProdDetailDO> listPMallOrderProdList(Integer orderId);
 }

src/main/java/com/mmc/oms/service/mall/impl/AppMallOrderServiceImpl.java

@@ -467,7 +467,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         List<MallOrderDO> orders = mallOrderDao.listAppPageAmOrder((pageNo - 1) * pageSize, pageSize, keyword, orderType, statusCodes, currentAccount.getUserAccountId());
         List<MallOrderPageDTO> mallOrderPageDTOList = mallOrderService.buildMallOrderPageDTO(orders, token);
         //需要处理所选规格
-        List<Long> orderIds = orders.stream().map(MallOrderDO::getId).collect(Collectors.toList());
+        List<Integer> orderIds = orders.stream().map(MallOrderDO::getId).collect(Collectors.toList());
         List<MallOrderSimpleDO> mallOrderSimpleDOList = appMallOrderDao.listMallOrderSkuSpec(orderIds);
         List<MallOrderPageDTO> collect = mallOrderPageDTOList.stream().map(d -> {
             for (MallOrderSimpleDO mallOrderSimpleDO : mallOrderSimpleDOList) {
@@ -501,8 +501,8 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         List<OrderGoodsIndstDTO> orderGoodsIndstDTOList = new ArrayList<>();
         //生成总订单id
         SnowFlake snowFlake = new SnowFlake(2, 3);
-        Long orderId = snowFlake.nextId();
-        String orderNo = CodeUtil.uavOrderCode(orderId);
+        Integer orderId = null;
+        String orderNo = CodeUtil.uavOrderCode();
         BigDecimal couponDiscount = BigDecimal.ZERO;
         // 多个购物车只取最后一个，有则有，没有则没有
         Integer recMallUserId = null;
@@ -902,7 +902,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         return mallDiscountInfoDTO;
     }
 
-    private List<OrderServiceDO> getOrderServiceDO(List<OrderGoodsProdDTO> orderGoodsProdDTOList, List<OrderGoodsIndstDTO> orderGoodsIndstDTOList, Long orderId){
+    private List<OrderServiceDO> getOrderServiceDO(List<OrderGoodsProdDTO> orderGoodsProdDTOList, List<OrderGoodsIndstDTO> orderGoodsIndstDTOList, Integer orderId){
         List<OrderServiceDO> orderServiceDOS = new ArrayList<>();
         Date cDate = new Date();
         for ( OrderGoodsProdDTO orderGoodsProdDTO : orderGoodsProdDTOList){
@@ -1132,7 +1132,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
      * @return {@link ResultBody}
      */
     @Override
-    public ResultBody getShareOrderStatus(Long orderId) {
+    public ResultBody getShareOrderStatus(Integer orderId) {
         // 将此订单id的分享状态进行变更
         MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(orderId);
         return ResultBody.success(mallOrderInfo.buildMallOrderDTO());
@@ -1146,7 +1146,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
      * @return {@link ResultBody}
      */
     @Override
-    public ResultBody acceptShare(Long orderId, Integer shareId) {
+    public ResultBody acceptShare(Integer orderId, Integer shareId) {
         // 根据订单id判断此订单是否已经有人接受共享了
         MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(orderId);
         if (mallOrderInfo.getShareStatus().equals(200)) {
@@ -1174,7 +1174,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
 
     @Transactional
     @Override
-    public ResultBody returnContractById(Long orderId) {
+    public ResultBody returnContractById(Integer orderId) {
         //订单状态退回到 待确认订单，手动折扣改为0，相关字段设置为空
         MallOrderDO order = mallOrderDao.getMallOrderInfo(orderId);
         order.setStatusCode(OrderStatus.PLACE_ORDER.getCode());
@@ -1239,7 +1239,6 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
             }
             //判断是否有无效的产品商品
             for (OrderGoodsProdDTO orderGoodsProdDTO : orderGoodsProdDTOList){
-                System.out.println("orderGoodsProdDTO:->>>" + orderGoodsProdDTO);
                 if(orderGoodsProdDTO.getDeleted() == 0 && orderGoodsProdDTO.getShelfStatus() == 1){
                     for (OrderGoodsProdDetailDTO orderGoodsProdDetailDTO : orderGoodsProdDTO.getOrderGoodsProdDetailDTOS()){
                         if( !(orderGoodsProdDetailDTO.getSpecDeleted() == 0 && orderGoodsProdDetailDTO.getSkuInfoDeleted() == 0 && orderGoodsProdDetailDTO.getSkuSpecDeleted() == 0)){
@@ -1307,8 +1306,8 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         List<OrderGoodsProdDTO> orderGoodsProdDTOList = new ArrayList<>();
         //生成总订单id
         SnowFlake snowFlake = new SnowFlake(2, 3);
-        Long orderId = snowFlake.nextId();
-        String orderNo = CodeUtil.uavOrderCode(orderId);
+        //Long orderId = snowFlake.nextId();
+        String orderNo = CodeUtil.uavOrderCode();
         BigDecimal couponDiscount = BigDecimal.ZERO;
 
         //处理产品商品
@@ -1338,68 +1337,70 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
             if(orderGoodsProdDOS == null){
                 return ResultBody.error(ResultEnum.SPEC_NOT_CONFIG_PRICE);
             }
-            //把每个商品所有规格金额加起来，订单金额
-            for (OrderGoodsProdDO orderGoodsProdDO : orderGoodsProdDOS){
-                orderAmount = orderAmount.add(orderGoodsProdDO.getGoodsAmount());
-            }
-
+            //把每个商品所有规格金额加起来，订单金额；
+            BigDecimal prodOrderAmount = orderGoodsProdDOS.stream().map(OrderGoodsProdDO::getGoodsAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            //插入订单主订单
+            //插入总订单信息
+            Date cdate = new Date();
+            MallOrderDO order = new MallOrderDO();
+            //order.setId(orderId);
+            order.setOrderNo(orderNo);
+            order.setPid(0);
+            order.setStatusCode(OrderStatus.PENDING_ASSIGNMENT.getCode());
+            order.setUserAccountId(currentAccount.getUserAccountId());
+            order.setUid(currentAccount.getUid());
+            order.setUserName(currentAccount.getUserName());
+            order.setPhoneNum(currentAccount.getPhoneNum());
+            order.setCreateTime(cdate);
+            order.setUserAddressId(param.getUserAddressId());
+            order.setOrderAmount(prodOrderAmount);
+            order.setRealityAmount(prodOrderAmount.subtract(couponDiscount));
+            order.setRemark(param.getRemark());
+            order.setCouponDiscountAmount(couponDiscount);
+            order.setRcdOrderAmount(rcdOrderAmount);
+            mallOrderDao.insertMallOrder(order);
+
+            List<OrderGoodsProdDO> orderGoodsProdDOList = orderGoodsProdDOS.stream().map(d -> {
+                d.setOrderId(order.getId());
+                return d;
+            }).collect(Collectors.toList());
             List<OrderGoodsProdDetailDO> orderGoodsProdDetailDOList = new ArrayList<>();
-            for (OrderGoodsProdDO orderGoodsProdDO : orderGoodsProdDOS){
-                //设置订单id
-                orderGoodsProdDO.setOrderId(orderId);
-            }
-
             //插入产品商品
             appMallOrderDao.batchInsertOrderGoodsProdDO(orderGoodsProdDOS);
-            for (OrderGoodsProdDO orderGoodsProdDO : orderGoodsProdDOS){
-                if(!CollectionUtils.isEmpty(orderGoodsProdDO.getOrderGoodsProdDetailDOList())){
-                    for (OrderGoodsProdDetailDO orderGoodsProdDetailDO : orderGoodsProdDO.getOrderGoodsProdDetailDOList()){
+            List<OrderGoodsProdDO> goodsProdDOList = orderGoodsProdDOList.stream().map(d -> {
+                if (!CollectionUtils.isEmpty(d.getOrderGoodsProdDetailDOList())) {
+                    d.getOrderGoodsProdDetailDOList().stream().map(dd -> {
                         //设置商品订单id
-                        orderGoodsProdDetailDO.setOrderGoodsProdId(orderGoodsProdDO.getId());
-                        orderGoodsProdDetailDOList.add(orderGoodsProdDetailDO);
-                    }
+                        dd.setOrderGoodsProdId(d.getId());
+                        orderGoodsProdDetailDOList.add(dd);
+                        return dd;
+                    }).collect(Collectors.toList());
                 }
-            }
+                return d;
+            }).collect(Collectors.toList());
 
             //批量插入产品商品规格
             appMallOrderDao.batchInsertOrderGoodsProdDetailDO(orderGoodsProdDetailDOList);
-        }
 
-        //插入总订单信息
-        Date cdate = new Date();
-        MallOrderDO order = new MallOrderDO();
-        order.setId(orderId);
-        order.setOrderNo(orderNo);
-        order.setPid(0);
-        order.setStatusCode(OrderStatus.PENDING_ASSIGNMENT.getCode());
-        order.setUserAccountId(currentAccount.getUserAccountId());
-        order.setUid(currentAccount.getUid());
-        order.setUserName(currentAccount.getUserName());
-        order.setPhoneNum(currentAccount.getPhoneNum());
-        order.setCreateTime(cdate);
-        order.setUserAddressId(param.getUserAddressId());
-        order.setOrderAmount(orderAmount);
-        order.setRealityAmount(orderAmount.subtract(couponDiscount));
-        order.setRemark(param.getRemark());
-        order.setCouponDiscountAmount(couponDiscount);
-        order.setRcdOrderAmount(rcdOrderAmount);
-        mallOrderDao.insertMallOrder(order);
-        //订单服务
-        List<OrderServiceDO> orderServiceDOS = this.getOrderServiceDO(orderGoodsProdDTOList, null, orderId);
-        if (!CollectionUtils.isEmpty(orderServiceDOS)) {
-            mallOrderDao.batchInsertOrderService(orderServiceDOS);
+            //订单服务
+            List<OrderServiceDO> orderServiceDOS = this.getOrderServiceDO(orderGoodsProdDTOList, null, order.getId());
+            if (!CollectionUtils.isEmpty(orderServiceDOS)) {
+                mallOrderDao.batchInsertOrderService(orderServiceDOS);
+            }
+            MallOrderExpressDO orderExpressDO = new MallOrderExpressDO(userAddressDTO);
+            orderExpressDO.setOrderId(order.getId());
+            //插入订单收货地址
+            mallOrderDao.insertOrderExpress(orderExpressDO);
+            MallOrderDTO morder = order.buildMallOrderDTO();
+            morder.setExp(orderExpressDO.buildOrderExpressDTO());
+            return ResultBody.success(morder);
         }
-        MallOrderExpressDO orderExpressDO = new MallOrderExpressDO(userAddressDTO);
-        orderExpressDO.setOrderId(orderId);
-        //插入订单收货地址
-        mallOrderDao.insertOrderExpress(orderExpressDO);
-        MallOrderDTO morder = order.buildMallOrderDTO();
-        morder.setExp(orderExpressDO.buildOrderExpressDTO());
-        return ResultBody.success(morder);
+        return ResultBody.success();
     }
 
     @Override
-    public MallOrderDTO getMallOrderDetailById(Long orderId, BaseAccountDTO currentAccount) {
+    public MallOrderDTO getMallOrderDetailById(Integer orderId, BaseAccountDTO currentAccount) {
 
         return null;
     }

src/main/java/com/mmc/oms/service/mall/impl/KdnExpServiceImpl.java

@@ -64,7 +64,7 @@ public class KdnExpServiceImpl implements KdnExpService {
 					String callBack = jsonObject.getString("CallBack");
 					String[]orderTag = callBack.split("-");
 					if(orderTag.length > 1 && orderTag[0].equals("UAV")){
-						Long orderId = Long.parseLong(orderTag[1]);
+						Integer orderId = Integer.parseInt(orderTag[1]);
 						MallOrderExpressDO orderExpressDO = new MallOrderExpressDO();
 						orderExpressDO.setOrderId(orderId);
 						orderExpressDO.setReceiveTime(new Date());
@@ -79,7 +79,7 @@ public class KdnExpServiceImpl implements KdnExpService {
 	}
 
 	@Override
-	public ResultBody testCallbackExpressInfo(String port, Long orderId, String shipperCode, String logisticCode, String phone) throws Exception {
+	public ResultBody testCallbackExpressInfo(String port, Integer orderId, String shipperCode, String logisticCode, String phone) throws Exception {
 		String s = KdnExpressUtil.monitorPush(port, orderId, shipperCode, logisticCode, phone);
 		if(!JSONObject.parseObject(s).getString("Success").equals("true")){
 			throw new BizException("快递信息错误，请重新填写后发货！");

src/main/java/com/mmc/oms/service/mall/impl/MallOrderServiceImpl.java

@@ -414,7 +414,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody confirmCost(Long orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser) {
+    public ResultBody confirmCost(Integer orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser) {
         MallOrderDO order = mallOrderDao.getMallOrderInfo(orderId);
         Integer nextStatus;
         Integer payStatus;
@@ -456,7 +456,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody confirmInventory(Long orderId, BaseAccountDTO cuser) {
+    public ResultBody confirmInventory(Integer orderId, BaseAccountDTO cuser) {
         MallOrderDO order = mallOrderDao.getMallOrderInfo(orderId);
         ResultBody result = this.orderEvolution(order, OrderStatus.CONFIRM_INVENTORY.getCode());
         if (!ResultBody.isSuccess(result)) {
@@ -566,7 +566,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody closeOrder(Long orderId, String shutReason, BaseAccountDTO cuser) {
+    public ResultBody closeOrder(Integer orderId, String shutReason, BaseAccountDTO cuser) {
         MallOrderDO order = mallOrderDao.getMallOrderInfo(orderId);
         StringBuffer stringBuffer = new StringBuffer();
         if (StringUtils.isEmpty(shutReason)){
@@ -632,7 +632,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 //        return 0;
 //    }
 
-    private String getOrderName(Long orderId){
+    private String getOrderName(Integer orderId){
         // 获取订单名字
         String orderName = "";
         List<MallOrderSimpleDO> pMallOrderSimpleDOList = orderGoodsProdService.listOrderGoodsProdBaseInfo(Arrays.asList(orderId));
@@ -1029,7 +1029,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 //    }
 
     @Override
-    public List<OrderPayDTO> listOrderPayInfo(Long orderId, Integer payType, BaseAccountDTO cuser) {
+    public List<OrderPayDTO> listOrderPayInfo(Integer orderId, Integer payType, BaseAccountDTO cuser) {
         List<OrderPayDTO> list = mallOrderDao.listOrderPay(orderId, payType).stream().map(d -> {
             return d.buildOrderPayDTO();
         }).collect(Collectors.toList());
@@ -1038,7 +1038,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultBody confirmAfPay(Long orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser) {
+    public ResultBody confirmAfPay(Integer orderId, Integer checkStatus, String refuseReason, List<String> vouchr, Integer type, BaseAccountDTO cuser) {
         MallOrderDO order = mallOrderDao.getMallOrderInfo(orderId);
         Integer nextStatus;
         Integer payStatus;
@@ -1160,7 +1160,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         if (mallOrderVO == null || mallOrderVO.getId() == null) {
             throw new BizException("订单id不能为空");
         }
-        Long mallOrderId = mallOrderVO.getId();
+        Integer mallOrderId = mallOrderVO.getId();
         MallOrderDO order = mallOrderDao.getMallOrderInfo(mallOrderId);
         ResultBody result = this.orderEvolution(order, OrderStatus.CONFIRM_ORDER.getCode());
         if (!ResultBody.isSuccess(result)) {
@@ -1186,7 +1186,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public void sendOrderStatusChangeMsg(Long mallOrderId) {
+    public void sendOrderStatusChangeMsg(Integer mallOrderId) {
         /**
         MallOrderDO order = mallOrderDao.getMallOrderInfo(mallOrderId);
         MallUserDTO mallUserDTO = mallUserClient.feignGetSimpleUserInfo(order.getMallUserId());
@@ -1246,7 +1246,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody closeMallOrder(Long id, BaseAccountDTO accountDTO) {
+    public ResultBody closeMallOrder(Integer id, BaseAccountDTO accountDTO) {
 //        MallOrderDO beforeMallOrderDO = new MallOrderDO();
 //        beforeMallOrderDO.setId(id);
 //        beforeMallOrderDO.setStatusCode(OrderStatus.CLOSE.getCode());
@@ -1265,7 +1265,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         return ResultBody.success();
     }
 
-    private void rollbackCoupons(Long id) {
+    private void rollbackCoupons(Integer id) {
         List<OrderCouponDO> orderCouponDOS = appMallOrderDao.listOrderCoupon(id);
         List<OrderCouponDTO> collect = orderCouponDOS.stream().map(d -> d.buildOrderCouponDTO()).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(collect)){
@@ -1275,7 +1275,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody updateMallOrder(Long orderId, Date singerTime) {
+    public ResultBody updateMallOrder(Integer orderId, Date singerTime) {
 //        MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(orderId);
 //        UavContractInfoDTO uavContractInfoDTO = fddServletClient.selectList(new UavContractInfoQO() {{
 //            setMallOrderId(orderId);
@@ -1290,7 +1290,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody allocateOperation(Long order, Integer operationId) {
+    public ResultBody allocateOperation(Integer order, Integer operationId) {
         MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(order);
         if (!mallOrderInfo.getStatusCode().equals(OrderStatus.PENDING_ASSIGNMENT.getCode())) {
             return ResultBody.error(ResultEnum.ORDER_STATUS_ERROR);
@@ -1342,7 +1342,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody updateStatusMallOrder(Long orderId, Integer signStatus) {
+    public ResultBody updateStatusMallOrder(Integer orderId, Integer signStatus) {
         Integer count = mallOrderDao.updateMallOrder(new MallOrderDO() {{
             setId(orderId);
             setSignStatus(signStatus);
@@ -1363,9 +1363,9 @@ public class MallOrderServiceImpl implements MallOrderService {
             log.info("当前没有任何订单完成合同签署");
             return;
         }
-        List<Long> mallOrderIds = new ArrayList<>();
+        List<Integer> mallOrderIds = new ArrayList<>();
         for (UavContractInfoDTO uavContractInfoDTO : result) {
-            Long mallOrderId = uavContractInfoDTO.getMallOrderId();
+            Integer mallOrderId = uavContractInfoDTO.getMallOrderId();
             Date singerTime = uavContractInfoDTO.getSingerTime();
             if (singerTime == null) {
                 log.info("签署时间不能为空,其订单id[{}]", mallOrderId);
@@ -1384,11 +1384,11 @@ public class MallOrderServiceImpl implements MallOrderService {
             return;
         }
         Collections.sort(mallOrderIds);
-        List<List<Long>> partition = Lists.partition(mallOrderIds, 500);
-        for (List<Long> orderIds : partition) {
+        List<List<Integer>> partition = Lists.partition(mallOrderIds, 500);
+        for (List<Integer> orderIds : partition) {
             List<MallOrderDO> mallOrderDOs = mallOrderDao.getMallOrderCreditPeriod(orderIds);
             for (MallOrderDO mallOrderDO : mallOrderDOs) {
-                Long mallOrderId = mallOrderDO.getId();
+                Integer mallOrderId = mallOrderDO.getId();
                 Date creditPeriod = mallOrderDO.getCreditPeriod();
                 if (mallOrderDO != null && creditPeriod != null) {
                     Integer statusCode = mallOrderDO.getStatusCode();
@@ -1474,7 +1474,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     @Override
     public List<MallOrderPageDTO> buildMallOrderPageDTO(List<MallOrderDO> list, String token) {
         //1查出相关商品信息、2查出运营人员、3查出合同信息、4查出推荐人信息、5查出、6设置订单产品清单
-        List<Long> mallOrderIds = list.stream().map(MallOrderDO::getId).collect(Collectors.toList());
+        List<Integer> mallOrderIds = list.stream().map(MallOrderDO::getId).collect(Collectors.toList());
         //List<Integer> mallUserIds = list.stream().map(MallOrderDO::getMallUserId).collect(Collectors.toList());
         List<Integer> rcdMallUserIds = list.stream().map(MallOrderDO::getRecMallUserId).collect(Collectors.toList());
         //批量查出所有商品信息，有产品和行业两种商品订单信息，分别查出
@@ -1644,7 +1644,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public MallOrderDTO getMallOrderDetailById(Long orderId, BaseAccountDTO currentAccount, String token) {
+    public MallOrderDTO getMallOrderDetailById(Integer orderId, BaseAccountDTO currentAccount, String token) {
         //1订单基本信息；2订单清单；3收货地址；4物流信息；5合同信息；6订单标题；7订单包含商品的数量；8订单服务；9订单状态转换；10渠道信息；11设置订单购买的规格信息；12查询使用的优惠券
         //1订单基本信息
         MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(orderId);
@@ -1679,7 +1679,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             }
         }
         //6订单标题
-        List<Long> orderIds = new ArrayList<>();
+        List<Integer> orderIds = new ArrayList<>();
         orderIds.add(orderId);
         List<MallOrderSimpleDO> pMallOrderSimpleDOList = orderGoodsProdService.listOrderGoodsProdBaseInfo(orderIds);
 //        List<MallOrderSimpleDO> iMallOrderSimpleDOList = orderGoodsIndstService.listOrderGoodsIndstBaseInfo(orderIds);
@@ -1739,7 +1739,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody updateMallOrderRemark(Long orderId, String remark) {
+    public ResultBody updateMallOrderRemark(Integer orderId, String remark) {
         if (remark.length() > 600){
             return ResultBody.error("备注长度大于600！");
         }
@@ -1754,7 +1754,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         if (mallOrderVO == null || mallOrderVO.getId() == null) {
             throw new BizException("订单id不能为空");
         }
-        Long mallOrderId = mallOrderVO.getId();
+        Integer mallOrderId = mallOrderVO.getId();
         MallOrderDO order = mallOrderDao.getMallOrderInfo(mallOrderId);
         //金额检验先注释20230406
         //mallOrderVO = updateCheckAndFill(mallOrderVO,order);
@@ -1879,7 +1879,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         return ResultBody.success();
     }
 
-    private List<MallOrderProdListDTO> getMallOrderProdListDTOList(Long orderId){
+    private List<MallOrderProdListDTO> getMallOrderProdListDTOList(Integer orderId){
         //订单商品清单
         List<OrderGoodsProdDetailDO> pMallOrderProdListDTOS = orderGoodsProdService.listPMallOrderProdList(orderId);
         //List<OrderGoodsIndstProdListDO> iMallOrderProdListDTOS = orderGoodsIndstService.listIMallOrderProdList(orderId);
@@ -1960,7 +1960,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 //    }
 
     @Override
-    public void exportMultiSheet(HttpServletResponse response, List<Long> orderIds) throws IOException {
+    public void exportMultiSheet(HttpServletResponse response, List<Integer> orderIds) throws IOException {
         // 判断id数组的长度是否大于5000
         if (orderIds.size() == 0 || orderIds.size() > 5000) {
             throw new BizException("没有需要导出的数据或导出数据大于5000条!");
@@ -1990,7 +1990,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         excelWriter.close();
     }
 
-    private List<OrderExportDTO> listOrderBasicInfo(List<Long> orderIds) {
+    private List<OrderExportDTO> listOrderBasicInfo(List<Integer> orderIds) {
         List<OrderExportDTO> orderExportList = new ArrayList<>();
         // 根据订单id获取信息
         List<MallOrderDO> mallOrderList = mallOrderDao.listMallOrder(orderIds);
@@ -2052,7 +2052,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public void operationalDataExport(List<Long> orderIds, HttpServletResponse response, BaseAccountDTO currentAccount) throws IOException {
+    public void operationalDataExport(List<Integer> orderIds, HttpServletResponse response, BaseAccountDTO currentAccount) throws IOException {
 //        // ①获取订单的基本信息
 //        int count = mallOrderDao.countPageOrderInfo(orderIds);
 //        if (count == 0) {
@@ -2173,7 +2173,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     }
 
     @Override
-    public ResultBody feignOrderUseCoupon(List<Long> orderIds) {
+    public ResultBody feignOrderUseCoupon(List<Integer> orderIds) {
         //待付款订单
         Integer obligation = mallOrderDao.countOrderForCouponUse(orderIds, OrderStatus.CONFIRM_ORDER.getCode());
         //已经付款订单
@@ -2184,7 +2184,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         return ResultBody.success(map);
     }
 
-    private List<OrderItem> getOrderItemList(Long orderId){
+    private List<OrderItem> getOrderItemList(Integer orderId){
         //订单商品清单
         List<OrderGoodsProdDetailDO> pMallOrderProdListDTOS = orderGoodsProdService.listPMallOrderProdList(orderId);
         List<OrderGoodsIndstProdListDO> iMallOrderProdListDTOS = orderGoodsIndstService.listIMallOrderProdList(orderId);
@@ -2200,7 +2200,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         return mallOrderItemList;
     }
 
-    private List<MallGoodsInfoDTO> buildMallGoodsInfoDTO(Long orderId){
+    private List<MallGoodsInfoDTO> buildMallGoodsInfoDTO(Integer orderId){
         // 根据订单id获取下单用户信息
         MallOrderDO mallOrderInfo = mallOrderDao.getMallOrderInfo(orderId);
         // 推荐人id

src/main/java/com/mmc/oms/service/mall/impl/MallOrderServiceSubImpl.java

@@ -29,9 +29,9 @@ public class MallOrderServiceSubImpl implements MallOrderServiceSub {
     @Override
     public ResultBody feignAutoCompleteMOrder() {
         //查询需要自动完成的订单（签收超过3*24小时后的订单）
-        List<Long> orderIds = orderExpressDao.listReceivedOrderIds();
+        List<Integer> orderIds = orderExpressDao.listReceivedOrderIds();
         //调用确认收货功能，但是没有上传验收单
-        for (Long orderId : orderIds){
+        for (Integer orderId : orderIds){
             OrderPayVO orderPayVO = new OrderPayVO();
             orderPayVO.setOrderId(orderId);
             mallOrderService.confirmReceipt(orderPayVO, null);

src/main/java/com/mmc/oms/service/mall/impl/OrderGoodsIndstServiceImpl.java

@@ -26,18 +26,18 @@ public class OrderGoodsIndstServiceImpl implements OrderGoodsIndstService {
     private OrderGoodsIndstDao orderGoodsIndstDao;
 
     @Override
-    public List<OrderGoodsIndstProdListBO> getProductInfoByMallId(Long orderId) {
+    public List<OrderGoodsIndstProdListBO> getProductInfoByMallId(Integer orderId) {
         return orderGoodsIndstDao.getProductInfoByMallId(orderId);
     }
 
     @Override
-    public List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Long> mallOrderIds) {
+    public List<MallOrderSimpleDO> listOrderGoodsIndstBaseInfo(List<Integer> mallOrderIds) {
         List<MallOrderSimpleDO> mallOrderSimpleDOList = orderGoodsIndstDao.listOrderGoodsIndstBaseInfo(mallOrderIds);
         return mallOrderSimpleDOList;
     }
 
     @Override
-    public List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Long orderId) {
+    public List<OrderGoodsIndstProdListDO> listIMallOrderProdList(Integer orderId) {
         List<OrderGoodsIndstProdListDO> orderGoodsIndstProdListDOS = orderGoodsIndstDao.listIMallOrderProdList(orderId);
         return orderGoodsIndstProdListDOS;
     }

src/main/java/com/mmc/oms/service/mall/impl/OrderGoodsProdServiceImpl.java

@@ -25,18 +25,18 @@ public class OrderGoodsProdServiceImpl implements OrderGoodsProdService {
     private OrderGoodsProdDao orderGoodsProdDao;
 
     @Override
-    public List<OrderGoodsProdDetailBO> getProductInfoByMallId(Long orderId) {
+    public List<OrderGoodsProdDetailBO> getProductInfoByMallId(Integer orderId) {
         return orderGoodsProdDao.getProductInfoByMallId(orderId);
     }
 
     @Override
-    public List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Long> mallOrderIds) {
+    public List<MallOrderSimpleDO> listOrderGoodsProdBaseInfo(List<Integer> mallOrderIds) {
         List<MallOrderSimpleDO> orderSimpleDOS = orderGoodsProdDao.listOrderGoodsProdBaseInfo(mallOrderIds);
         return orderSimpleDOS;
     }
 
     @Override
-    public List<OrderGoodsProdDetailDO> listPMallOrderProdList(Long orderId) {
+    public List<OrderGoodsProdDetailDO> listPMallOrderProdList(Integer orderId) {
         List<OrderGoodsProdDetailDO> orderGoodsProdDetailDOList = orderGoodsProdDao.listPMallOrderProdList(orderId);
         return orderGoodsProdDetailDOList;
     }

src/main/resources/mapper/mall/order/OrderExpressDao.xml

@@ -59,7 +59,7 @@
 		from express_info
 	</select>
 
-	<select id="listReceivedOrderIds" resultType="java.lang.Long">
+	<select id="listReceivedOrderIds" resultType="java.lang.Integer">
 		select * from mall_order mo INNER JOIN mall_order_express oe ON mo.id = oe.order_id
 		where mo.status_code = 720 and oe.is_receive = 1 and TIMESTAMPDIFF(HOUR,'2023-02-10 16:15:00',NOW()) >= 72
 	</select>