Merge branch 'master' of hj/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -775,7 +775,7 @@ public class OrderController {
                     orderWXPayRecordService.getRecordsByOutTradeNo(orderEntity.getOrderSn());
             for (OrderWXPayRecordEntity orderWXPayRecordTemp : orderWXPayRecordEntitys) {
                 //查询出来的记录排除当前已支付成功的记录,对其他记录交易状态为未撤销,未关闭的订单，调用撤销订单
-                if (orderWXPayRecordTemp.getId() != orderWXPayRecordCurrent.getId() &&
+                if (!orderWXPayRecordTemp.getId().equals(orderWXPayRecordCurrent.getId()) &&
                     (!WechatUtil.WXTradeState.REVOKED.getCode().equals(orderWXPayRecordTemp.getTradeState()) ||
                      !WechatUtil.WXTradeState.CLOSED.getCode().equals(orderWXPayRecordTemp.getTradeState()))) {
                     WechatReverseApiResult wechatReverseApiResult =
@@ -1346,10 +1346,10 @@ public class OrderController {
         //查询列表数据
         // =================================================System Format导出开始=====================================
         List<SystemFormatDto> systemFormatList = orderService.queryExportSystemFormatList(params);
-        String[] header = new String[]{"Receipt No.", "Cash Register No.", "Time Stamp Details (Date & Time)", "Staff ID", "Staff Name",
+        String[] header = new String[]{"Receipt No.","Store Name", "Cash Register No.", "Time Stamp Details (Date & Time)", "Staff ID", "Staff Name",
                 "HS Code", "HS Code Name", "E-matou Code", "PLU", "MychemID", "Product Name (EN)","Product Name (CN)", "Barcode", "Pack Size", "Product Specification",
-                "Brand","EDLP","Current Price","Cost Price","Deduction Rate","Unit Sold","Sales","Tax amount","Total Sales incl. Tax","Tax Rate",
-                "GP ￥","GP %","Product Category","Supplier Name","Transaction Type","Sale Return Type","Remark"};
+                "Brand","EDLP","Current Price","Cost Price","Prime Cost","Goods Number","Deduction Rate","Unit Sold","Sales","Tax amount","Total Sales incl. Tax","Tax Rate",
+                "GP ￥","GP %","Product Category","Supplier Name","Transaction Type","Sale Return Type","Order Status","Pay Flag","Order SnWx","Order SnAli","Remark"};
 
         LinkedHashMap<String, Object> headerMap = initHeaderMap();
         List<Map<String, Object>> list = new LinkedList<>();
@@ -1436,15 +1436,22 @@ public class OrderController {
                     }
                 }
                 // 如果是退货
-                if (Dict.orderStatus.item_401.getItem().equals(systemFormat.getOrderStatus())){
+                String orderStatus = systemFormat.getOrderStatus();
+                if (Dict.orderStatus.item_401.getItem().equals(orderStatus)){
                     systemFormat.setSaleReturnType("整单退货");
                     systemFormat.setTransactionType("退货");
                 }else{
                     systemFormat.setTransactionType("销售");
                 }
-
-
+                orderStatus = Dict.orderStatus.valueOf("item_"+orderStatus).getItemName();
+                if (Objects.nonNull(systemFormat.getPrimeCost()) && Objects.nonNull(systemFormat.getGoodsNumber())) {
+                    String primeCost = systemFormat.getPrimeCost();
+                    BigDecimal gp = new BigDecimal(primeCost);
+                    primeCost = gp.setScale(2,BigDecimal.ROUND_HALF_UP).toString();
+                    systemFormat.setPrimeCost(primeCost);
+                }
                 map.put("ReceiptNo",systemFormat.getReceiptNo());
+                map.put("StoreName",systemFormat.getStoreName());
                 map.put("CashRegisterNo",systemFormat.getCashRegisterNo());
                 map.put("TimeStampDetails",systemFormat.getTimeStampDetails());
                 map.put("StaffID",systemFormat.getStaffID());
@@ -1463,6 +1470,8 @@ public class OrderController {
                 map.put("EDLP",systemFormat.getEdlp());
                 map.put("CurrentPrice",systemFormat.getCurrentPrice());
                 map.put("CostPrice",systemFormat.getCostPrice());
+                map.put("PrimeCost",systemFormat.getPrimeCost());
+                map.put("GoodsNumber",systemFormat.getGoodsNumber());
                 map.put("DeductionRate",systemFormat.getDeductionRate());
                 map.put("UnitSold",systemFormat.getUnitSold());
                 map.put("Sales",systemFormat.getSales());
@@ -1475,6 +1484,10 @@ public class OrderController {
                 map.put("SupplierName",systemFormat.getSupplierName());
                 map.put("TransactionType",systemFormat.getTransactionType());
                 map.put("SaleReturnType",systemFormat.getSaleReturnType());
+                map.put("OrderStatus",orderStatus);
+                map.put("PayFlag",systemFormat.getPayFlag());
+                map.put("OrderSnWx",systemFormat.getOrderSnWx());
+                map.put("OrderSnAli",systemFormat.getOrderSnAli());
                 map.put("Remark",systemFormat.getRemark());
 
                 list.add(map);
@@ -1494,6 +1507,7 @@ public class OrderController {
     private LinkedHashMap<String, Object> initHeaderMap() {
         LinkedHashMap<String, Object> headerMap = new LinkedHashMap<>();
         headerMap.put("ReceiptNo","销售单号");
+        headerMap.put("StoreName","门店名称");
         headerMap.put("CashRegisterNo","收银台");
         headerMap.put("TimeStampDetails","销售时间");
         headerMap.put("StaffID","收银员");
@@ -1512,6 +1526,8 @@ public class OrderController {
         headerMap.put("EDLP","日常价");
         headerMap.put("CurrentPrice","实际销售价");
         headerMap.put("CostPrice","进货价");
+        headerMap.put("PrimeCost","成本价");
+        headerMap.put("GoodsNumber","可用库存数");
         headerMap.put("DeductionRate","扣率 (EDLP vs 实际销售价)");
         headerMap.put("UnitSold","销售数量");
         headerMap.put("Sales","销售额");
@@ -1524,6 +1540,10 @@ public class OrderController {
         headerMap.put("SupplierName","主供应商名称");
         headerMap.put("TransactionType","销售类型");
         headerMap.put("SaleReturnType","退货类型");
+        headerMap.put("OrderStatus","支付状态");
+        headerMap.put("PayFlag","支付方式");
+        headerMap.put("OrderSnWx","微信流水号");
+        headerMap.put("OrderSnAli","支付宝流水号");
         headerMap.put("Remark","备注");
         return headerMap;
     }

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -164,7 +164,7 @@ public class StoreController {
     public R queryAll(@RequestParam Map<String, Object> params) {
 
         ParamUtils.setQueryPowerByRoleType(params, "id", "merchSn", "thirdPartyMerchCode");
-
+        params.put("isValid",Dict.isValid.item_0.getItem());
         List<StoreEntity> list = storeService.queryList(params);
 
         return R.ok().put("list", list);

kmall-admin/src/main/java/com/kmall/admin/dto/SystemFormatDto.java

@@ -52,6 +52,13 @@ public class SystemFormatDto implements Serializable {
 
     private String refundTime;//退款时间
 
+    private String primeCost;//成本价=备案单价*货物数量（门店现有库存）
+    private String goodsNumber;//可用库存数
+    private String storeName;//门店名称
+    private String payFlag;//支付方式
+    private String orderSnWx;//微信流水号
+    private String orderSnAli;//支付宝流水号
+
     public String getOutRefundNo() {
         return outRefundNo;
     }
@@ -347,4 +354,52 @@ public class SystemFormatDto implements Serializable {
     public void setTaxPrice(String taxPrice) {
         this.taxPrice = taxPrice;
     }
+
+    public String getGoodsNumber() {
+        return goodsNumber;
+    }
+
+    public void setGoodsNumber(String goodsNumber) {
+        this.goodsNumber = goodsNumber;
+    }
+
+    public String getPrimeCost() {
+        return primeCost;
+    }
+
+    public void setPrimeCost(String primeCost) {
+        this.primeCost = primeCost;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getPayFlag() {
+        return payFlag;
+    }
+
+    public void setPayFlag(String payFlag) {
+        this.payFlag = payFlag;
+    }
+
+    public String getOrderSnWx() {
+        return orderSnWx;
+    }
+
+    public void setOrderSnWx(String orderSnWx) {
+        this.orderSnWx = orderSnWx;
+    }
+
+    public String getOrderSnAli() {
+        return orderSnAli;
+    }
+
+    public void setOrderSnAli(String orderSnAli) {
+        this.orderSnAli = orderSnAli;
+    }
 }

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2052,6 +2052,7 @@
         g.goods_id,
         o.order_sn as receiptNo,
         u.username as cashRegisterNo,
+
         o.create_time as timeStampDetails,
         u.username as staffID,
         u.username as staffName,
@@ -2064,17 +2065,23 @@
         gs.name as productNameCN,
         gs.prod_barcode as barcode,
         gs.ciq_prod_model as packSize,
+        gs.goods_number as goodsNumber,
         uc.name as productSpecification,
         b.name as brand,
         gs.daily_price as edlp,
         sr.bottom_line_price as costPrice,
+        sr.bottom_line_price*gs.goods_number as primeCost,
         g.number as unitSold,
         g.actual_payment_amount as totalSalesInclTax,
         gs.goods_rate as taxRate,
         '专柜单品' as productCategory,
         sup.child_supplier_name as supplierName,
         '300' as orderStatus,
-        g.tax_price as taxPrice
+        g.tax_price as taxPrice,
+        s.store_name as storeName,
+        o.pay_flag as payFlag,
+        o.order_sn_wx as orderSnWx,
+        o.ali_trade_no as orderSnAli
         FROM
         mall_order o
         LEFT JOIN mall_order_goods g ON o.id = g.order_id
@@ -2111,9 +2118,7 @@
             AND s.store_name LIKE concat('%',#{storeName},'%')
         </if>
 
-
-
-        union
+         union
 
         SELECT distinct
         o.id,
@@ -2132,17 +2137,24 @@
         gs.name as productNameCN,
         gs.prod_barcode as barcode,
         gs.ciq_prod_model as packSize,
+        gs.goods_number as goodsNumber,
         uc.name as productSpecification,
         b.name as brand,
         gs.daily_price as edlp,
         sr.bottom_line_price as costPrice,
+        sr.bottom_line_price*gs.goods_number as primeCost,
         g.number as unitSold,
         g.actual_payment_amount as totalSalesInclTax,
         gs.goods_rate as taxRate,
         '专柜单品' as productCategory,
         sup.child_supplier_name as supplierName,
         o.order_status as orderStatus,
-        g.tax_price as taxPrice
+        g.tax_price as taxPrice,
+
+        s.store_name as storeName,
+        o.pay_flag as payFlag,
+        o.order_sn_wx as orderSnWx,
+        o.ali_trade_no as orderSnAli
         FROM
         mall_order o
         LEFT JOIN mall_order_goods g ON o.id = g.order_id