平台后台，商品增加需要记录微博名标记设置，订单画面显示微博名。增加导出功能，增加购物车商品的第三方ID标记

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/controller/OrderController.java

@@ -2,6 +2,7 @@ package com.xingxi.web.controller.business.order.controller;
 
 import com.xingxi.business.Banner.domain.Banner;
 import com.xingxi.business.Order.domain.Order;
+import com.xingxi.business.SuggestProd.domain.SuggestProd;
 import com.xingxi.common.annotation.Log;
 import com.xingxi.common.core.controller.BaseController;
 import com.xingxi.common.core.domain.AjaxResult;
@@ -11,8 +12,10 @@ import com.xingxi.common.enums.EBannerType;
 import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.enums.ERoleKey;
 import com.xingxi.common.utils.DateUtils;
+import com.xingxi.common.utils.MaskUtils;
 import com.xingxi.common.utils.RMBUtil;
 import com.xingxi.common.utils.ShiroUtils;
+import com.xingxi.common.utils.poi.ExcelUtil;
 import com.xingxi.web.controller.business.order.domain.OrderDetailVo;
 import com.xingxi.web.controller.business.order.domain.OrderVo;
 import com.xingxi.web.controller.business.order.service.IOrderDetailVoService;
@@ -65,6 +68,25 @@ public class OrderController extends BaseController {
     }
 
     /**
+     * 导出推荐商品列表
+     */
+    @RequiresPermissions("business:order:list")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(OrderVo orderVo) {
+        orderVo.setDelFlag(EDelFlag.NO.getVal());
+        List<OrderVo> list = orderVoService.selectOrderVoList(orderVo);
+
+        for (OrderVo order : list) {
+            order.setOrderAmount(RMBUtil.fenToYuan(order.getOrderAmount()));
+            order.setPayAmount(RMBUtil.fenToYuan(order.getPayAmount()));
+        }
+        ExcelUtil<OrderVo> util = new ExcelUtil<>(OrderVo.class);
+        return util.exportExcel(list, "订单数据");
+    }
+
+    /**
      * 显示订单明细页
      */
     @RequiresPermissions("business:order:detail")

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/domain/OrderVo.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.business.order.domain;
 
 import com.xingxi.business.Order.domain.Order;
+import com.xingxi.common.annotation.Excel;
 import lombok.Data;
 import lombok.ToString;
 
@@ -23,6 +24,7 @@ public class OrderVo extends Order {
     // 店铺联系方式
     private String sellerMobile;
     // 购买者姓名
+//    @Excel(name = "购买者昵称")
     private String buyerName;
     // 商品名称
     private String prodName;

08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/order/order.html

@@ -70,6 +70,9 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
+				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="business:order:list">
+					<i class="fa fa-download"></i> EXCEL导出
+				</a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table" data-mobile-responsive="true"></table>
@@ -116,7 +119,7 @@
 				updateUrl: prefix + "/edit/{id}",
 				removeUrl: prefix + "/remove",
 				exportUrl: prefix + "/export",
-				modalName: "新闻广告",
+				modalName: "订单",
 				showSearch: false,
 				showColumns: false,
 				columns: [

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/utils/MaskUtils.java

@@ -55,7 +55,7 @@ public final class MaskUtils {
     }
 
     /**
-     * 掩饰手机号,前6，后4，中间用*
+     * 掩饰手机号,前3，后4，中间用*
      *
      * @param str
      * @return

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsListResponse.java

@@ -1,6 +1,5 @@
 package com.xingxi.api.model;
 
-import com.xingxi.business.Carts.domain.Carts;
 import lombok.Value;
 
 import java.util.List;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsResponse.java

@@ -38,6 +38,8 @@ public class CartsResponse {
     // 是否选中
     private String checkFlag;
 
+    private String thirdIdConfirmFlag;
+
     private List<ProdPic> prodPicList;
 
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsApiServiceImpl.java

@@ -18,6 +18,7 @@ import com.xingxi.common.utils.RMBUtil;
 import com.xingxi.common.utils.StringUtils;
 import com.xingxi.master.merchant.domain.MerchantProd;
 import com.xingxi.master.merchant.mapper.MerchantProdMapper;
+import com.xingxi.master.product.domain.Prod;
 import com.xingxi.master.product.domain.ProdAttrPrice;
 import com.xingxi.master.product.domain.ProdPic;
 import com.xingxi.master.product.mapper.ProdAttrPriceMapper;
@@ -115,12 +116,14 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             MerchantProd mercProd = wxApiProductMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
 
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
@@ -206,8 +209,9 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
 
             cartsResponse.setMercProdId(carts.getMercProdId());
@@ -266,7 +270,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
@@ -313,7 +319,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
@@ -387,7 +395,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
@@ -449,7 +459,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
@@ -512,7 +524,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setUserId(userId);
             cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
-            cartsResponse.setProdName(wxApiProductMapper.selectProdById(mercProd.getProdId()).getProdName());
+            Prod prod = wxApiProductMapper.selectProdById(mercProd.getProdId());
+            cartsResponse.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+            cartsResponse.setProdName(prod.getProdName());
             cartsResponse.setProdAttrName(wxApiProductMapper.selectProdAttrByProdAttrId(carts.getProdAttrId()).getAttrName());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/Order/domain/Order.java

@@ -35,11 +35,11 @@ public class Order extends BaseEntity {
     private Date orderTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
 
     // 订单状态
-    @Excel(name = "订单状态", dictType = "orderStatus")
+    @Excel(name = "订单状态", dictType = "order_status")
     private String orderStatus;
 
     // 订单总额
@@ -47,7 +47,7 @@ public class Order extends BaseEntity {
     private BigDecimal orderAmount;
 
     // 支付金额
-    @Excel(name = "支付金额")
+//    @Excel(name = "支付金额")
     private BigDecimal payAmount;
 
     // 商品数量
@@ -55,37 +55,37 @@ public class Order extends BaseEntity {
     private Integer prodQuantity;
 
     // 购方用户ID
-    @Excel(name = "购方用户ID")
+//    @Excel(name = "购方用户ID")
     private Long buyerId;
 
     // 销方用户ID
-    @Excel(name = "销方用户ID")
+//    @Excel(name = "销方用户ID")
     private Long sellerId;
 
     // 取消时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date cancelTime;
 
     // 完成时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
     // 收件人省名称
-    @Excel(name = "收件人省名称")
+//    @Excel(name = "收件人省名称")
     private String recProv;
 
     // 收件人市名称
-    @Excel(name = "收件人市名称")
+//    @Excel(name = "收件人市名称")
     private String recCity;
 
     // 收件人区名称
-    @Excel(name = "收件人区名称")
+//    @Excel(name = "收件人区名称")
     private String recDistrict;
 
     // 收件人地址
-    @Excel(name = "收件人地址")
+//    @Excel(name = "收件人地址")
     private String recAddress;
 
     // 收件人姓名
@@ -100,6 +100,6 @@ public class Order extends BaseEntity {
     private String remark;
 
     // 删除标志（0代表存在 2代表删除）
-    @Excel(name = "删除标志", readConverterExp = "0=代表存在,1=代表删除")
+//    @Excel(name = "删除标志", readConverterExp = "0=代表存在,1=代表删除")
     private String delFlag;
 }