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

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

@@ -326,6 +326,7 @@ public class GoodsProductController {
                         }
                         GoodsProductEntity upd = new GoodsProductEntity();
                         upd.setMallGoodsProductSn(entity.getMallGoodsProductSn());
+                        upd.setSku(sku);
                         PdProductImgDto tmpDto = new PdProductImgDto();
                         if (imgType.equals("up")) {
                             upd.setUpImg(url);

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

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 /**
- * 取货码信息表Controller
+ * 小票码信息表Controller
  *
  * @author emato
  * @email admin@qhdswl.com
@@ -113,7 +113,7 @@ public class PickUpCodeController {
     }
 
     /**
-     * 生成取货码
+     * 生成小票码
      */
     @RequestMapping("/save")
     @RequiresPermissions("pickupcode:save")
@@ -125,14 +125,14 @@ public class PickUpCodeController {
 
         int result = pickUpCodeService.save(pickUpCode);
         if (result <= 0 ){
-            return R.error("生成取货码失败！");
+            return R.error("生成小票码失败！");
         }
 
         return R.ok().put("pickUpCode",pickUpCode );
     }
 
     /**
-     * 取货码核销
+     * 小票码核销
      */
     @RequestMapping("/verification")
     @RequiresPermissions("pickupcode:update")
@@ -144,7 +144,7 @@ public class PickUpCodeController {
 
         String status = pickUpCodeService.queryPickUpCodeStatus(pickUpCode.getOrderSn());
         if(status.equals("1")){
-            return R.error("取货码已核销过！");
+            return R.error("小票码已核销过！");
         }
 
         pickUpCode.setPickUpCodeStatus("1");
@@ -157,7 +157,7 @@ public class PickUpCodeController {
 
         int result = pickUpCodeService.update(pickUpCode);
         if (result <= 0 ){
-            return R.error("取货码核销失败！");
+            return R.error("小票码核销失败！");
         }
         PickUpCodeEntity pickUpCodeEntity = pickUpCodeService.queryObject(pickUpCode.getOrderSn());
 

kmall-admin/src/main/java/com/kmall/admin/dao/PickUpCodeDao.java

@@ -5,7 +5,7 @@ import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * 取货码信息表Dao
+ * 小票码信息表Dao
  *
  * @author emato
  * @email admin@qhdswl.com
@@ -21,7 +21,7 @@ public interface PickUpCodeDao extends BaseDao<PickUpCodeEntity> {
     public String queryPickUpCodeStatus(@Param("orderSn") String orderSn);
 
     /**
-     * 查询最大的取货码
+     * 查询最大的小票码
      * @param nowTime
      * @return
      */

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -208,10 +208,10 @@ public class OrderEntity implements Serializable {
 
     private BigDecimal tax;
 
-    //取货码
+    //小票码
     private String pickUpCodeSn;
 
-    //取货码状态
+    //小票码状态
     private String pickUpCodeStatus;
 
     public BigDecimal getTopicPrice() {

kmall-admin/src/main/java/com/kmall/admin/entity/PickUpCodeEntity.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 取货码信息表实体
+ * 小票码信息表实体
  * 表名 mall_pick_up_code
  *
  * @author emato
@@ -19,7 +19,7 @@ public class PickUpCodeEntity implements Serializable {
      */
     private String orderSn;
     /**
-     * 取货码
+     * 小票码
      */
     private String pickUpCodeSn;
     /**
@@ -27,15 +27,15 @@ public class PickUpCodeEntity implements Serializable {
      */
     private String merchOrderSn;
     /**
-     * 取货码状态,0:未取,1:已取,2:可取
+     * 小票码状态,0:未取,1:已取,2:可取
      */
     private String pickUpCodeStatus;
     /**
-     * 取货码生成时间
+     * 小票码生成时间
      */
     private String pickUpCodeCreatetime;
     /**
-     * 取货码核销时间
+     * 小票码核销时间
      */
     private String pickUpCodeVerificationtime;
     /**
@@ -73,14 +73,14 @@ public class PickUpCodeEntity implements Serializable {
         return orderSn;
     }
     /**
-     * 设置：取货码
+     * 设置：小票码
      */
     public void setPickUpCodeSn(String pickUpCodeSn) {
         this.pickUpCodeSn = pickUpCodeSn;
     }
 
     /**
-     * 获取：取货码
+     * 获取：小票码
      */
     public String getPickUpCodeSn() {
         return pickUpCodeSn;
@@ -99,40 +99,40 @@ public class PickUpCodeEntity implements Serializable {
         return merchOrderSn;
     }
     /**
-     * 设置：取货码状态,0:未取,1:已取
+     * 设置：小票码状态,0:未取,1:已取
      */
     public void setPickUpCodeStatus(String pickUpCodeStatus) {
         this.pickUpCodeStatus = pickUpCodeStatus;
     }
 
     /**
-     * 获取：取货码状态,0:未取,1:已取
+     * 获取：小票码状态,0:未取,1:已取
      */
     public String getPickUpCodeStatus() {
         return pickUpCodeStatus;
     }
     /**
-     * 设置：取货码生成时间
+     * 设置：小票码生成时间
      */
     public void setPickUpCodeCreatetime(String pickUpCodeCreatetime) {
         this.pickUpCodeCreatetime = pickUpCodeCreatetime;
     }
 
     /**
-     * 获取：取货码生成时间
+     * 获取：小票码生成时间
      */
     public String getPickUpCodeCreatetime() {
         return pickUpCodeCreatetime;
     }
     /**
-     * 设置：取货码核销时间
+     * 设置：小票码核销时间
      */
     public void setPickUpCodeVerificationtime(String pickUpCodeVerificationtime) {
         this.pickUpCodeVerificationtime = pickUpCodeVerificationtime;
     }
 
     /**
-     * 获取：取货码核销时间
+     * 获取：小票码核销时间
      */
     public String getPickUpCodeVerificationtime() {
         return pickUpCodeVerificationtime;

kmall-admin/src/main/java/com/kmall/admin/service/PickUpCodeService.java

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 取货码信息表Service接口
+ * 小票码信息表Service接口
  *
  * @author emato
  * @email admin@qhdswl.com

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -140,8 +140,8 @@ public class GoodsProductServiceImpl implements GoodsProductService {
         // 获取单位代码
         List<SysCusUnitCodeEntity> cusUnitCodeEntityList = sysCusUnitCodeService.getAll();
         boolean flag = false;
+        int count = 1;
         if (Objects.nonNull(goodsProductDtoList) && goodsProductDtoList.size() > 0) {
-            int count = 1;
             for (GoodsProductDto goodsProductDto : goodsProductDtoList) {
                 if (StringUtils.isEmpty(goodsProductDto.getMerchSn())) {
                     throw new RRException("第" + count + "行的商户编号为空！");
@@ -311,6 +311,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 insertList.add(goodsProductEntity);
             }
             goodsProductDao.saveBatch(insertList);
+            count=goodsProductDtoList.size();
             return count;
         }
         return 0;
@@ -498,7 +499,6 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 return result.getMsg();
             }
             List<GoodsProductEntity> updateList = new ArrayList<>();
-            List<GoodsProductEntity> insertList = new ArrayList<>();
             List rows = (List) result.getData().getRows().get(0);
             for(int i = 0 ; i < rows.size() ; i ++) {
                 LinkedTreeMap<String, Object> treeMap = (LinkedTreeMap<String, Object>) rows.get(i);
@@ -509,37 +509,39 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 String netWeight = treeMap.get("netWeight").toString(); //净重,kg
                 String grossWeight = treeMap.get("grossWeight").toString(); //毛重,kg
                 String ciqMainEle = treeMap.get("ciqMainEle").toString();   //主要成分
-                String cusCode = treeMap.get("cusCode").toString(); //
-                String bondedCode = treeMap.get("bondedCode").toString();   //海关商品编码
-                String localEmsNo = treeMap.get("localEmsNo").toString();   //园区账册编号
-                String itemRecordNo = treeMap.get("itemRecordNo").toString();   //园区商品序号
-               /* String remark = null ;
-                if (treeMap.get("remark") != null) {
-                    remark = treeMap.get("remark").toString();   //备注
-                }*/
-                String legalUnit1Qty = treeMap.get("legalUnit1Qty").toString(); //法1
-                String legalUnit2Qty = treeMap.get("legalUnit2Qty").toString(); //法2
                 String cusDeclEle = treeMap.get("cusDeclEle").toString();   //申报要素
-               /* String modTime = null ;
-                if (treeMap.get("modTime")!=null) {
-                    modTime = treeMap.get("modTime").toString();
-                }*/
+                String localEmsNo = null;   //园区账册编号
+                if (treeMap.get("localEmsNo")!=null) {
+                    localEmsNo = treeMap.get("localEmsNo").toString();
+                }
+                String itemRecordNo = null;   //园区商品序号
+                if (treeMap.get("itemRecordNo")!=null) {
+                    itemRecordNo = treeMap.get("itemRecordNo").toString();
+                }
+                String legalUnit1Qty = null ; //法1
+                if (treeMap.get("legalUnit1Qty")!=null) {
+                    legalUnit1Qty = treeMap.get("legalUnit1Qty").toString();
+                }
+                String legalUnit2Qty = null; //法2
+                if (treeMap.get("legalUnit2Qty")!=null) {
+                    legalUnit2Qty = treeMap.get("legalUnit2Qty").toString();
+                }
+
                 for (GoodsProductEntity goodsProductEntity : goodsProductEntityList) {
                     if (merchSn1.equals(goodsProductEntity.getMerchSn()) && sku.equals(goodsProductEntity.getSku()) && prodBarcode.equals(goodsProductEntity.getProdBarcode())) {
                         goodsProductEntity.setGrossWeight(new BigDecimal(grossWeight));
                         goodsProductEntity.setNetWeight(new BigDecimal(netWeight));
-                        goodsProductEntity.setLegalUnit1Qty(new BigDecimal(legalUnit1Qty));
-                        goodsProductEntity.setLegalUnit2Qty(new BigDecimal(legalUnit2Qty));
+                        if (legalUnit1Qty!=null) {
+                            goodsProductEntity.setLegalUnit1Qty(new BigDecimal(legalUnit1Qty));
+                        }
+                        if (legalUnit2Qty!=null) {
+                            goodsProductEntity.setLegalUnit2Qty(new BigDecimal(legalUnit2Qty));
+                        }
                         goodsProductEntity.setCiqMainEle(ciqMainEle);
                         goodsProductEntity.setCusDeclEle(cusDeclEle);
-//                        goodsProductEntity.setOmsAuditRemark(remark);
                         goodsProductEntity.setItemRecordNo(itemRecordNo);
                         goodsProductEntity.setLocalEmsNo(localEmsNo);
                         goodsProductEntity.setProdBrand(prodBrand);
-//                        if (modTime!=null) {
-//                            goodsProductEntity.setOmsAuditTime(DateUtils.strToDate(modTime));
-//                        }
-//                        goodsProductEntity.setOmsAuditStatus("2");
                         goodsProductEntity.setModTime(new Date());
                         goodsProductEntity.setModerSn(ShiroUtils.getUserId().toString());
                         goodsProductEntity.setStatus(Dict.productRecordStatus.item_22.getItem());

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2218,11 +2218,11 @@ public class OrderServiceImpl implements OrderService {
             }
 
             // TODO 到时候要注释掉，测试用而已
-//            OrderEntity orderEntity = queryObject(order.getId());
-//            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
-//            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
-//            orderEntity.setPayTime(new Date());
-//            orderDao.update(orderEntity);
+           /* OrderEntity orderEntity = queryObject(order.getId());
+            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+            orderEntity.setPayTime(new Date());
+            orderDao.update(orderEntity);*/
 
 
             resultObj.put("shopName", store.getStoreName()); // 根据门店编号查询
@@ -2287,7 +2287,7 @@ public class OrderServiceImpl implements OrderService {
             // 生成取票码
             PickUpCodeEntity pickUpCodeEntity = new PickUpCodeEntity();
             pickUpCodeEntity.setOrderSn(order.getOrder_sn());
-            pickUpCodeEntity.setPickUpCodeSn(cashierEntity.getCashierSn());//取货码前段
+            pickUpCodeEntity.setPickUpCodeSn(cashierEntity.getCashierSn());//小票码前段
             pickUpCodeService.save(pickUpCodeEntity);
 
             resultObj.put("code", pickUpCodeEntity.getPickUpCodeSn()); // 系统中累加
@@ -2799,7 +2799,7 @@ public class OrderServiceImpl implements OrderService {
                 LOGGER.info("微信退款");
 
                 orderDao.update(order);//修改为退款成功
-                // 修改取货码
+                // 修改小票码
                 PickUpCodeEntity pickUpCodeEntity = pickUpCodeService.queryObject(order.getOrderSn());
                 pickUpCodeEntity.setPickUpCodeStatus("3");
                 pickUpCodeService.update(pickUpCodeEntity);
@@ -2861,7 +2861,7 @@ public class OrderServiceImpl implements OrderService {
             order.setPayStatus(Integer.parseInt(Dict.payStatus.item_5.getItem()));
             order.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_401.getItem()));
             orderDao.update(order);//修改为退款成功
-            // 修改取货码
+            // 修改小票码
             PickUpCodeEntity pickUpCodeEntity = pickUpCodeService.queryObject(order.getOrderSn());
             pickUpCodeEntity.setPickUpCodeStatus("3");
             pickUpCodeService.update(pickUpCodeEntity);

kmall-admin/src/main/java/com/kmall/admin/service/impl/PickUpCodeServiceImpl.java

@@ -16,7 +16,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * 取货码信息表Service实现类
+ * 小票码信息表Service实现类
  *
  * @author emato
  * @email admin@qhdswl.com

kmall-admin/src/main/java/com/kmall/admin/websocket/WebSocketServer.java

@@ -39,7 +39,7 @@ public class WebSocketServer {
     private static final AtomicInteger OnlineCount = new AtomicInteger(0);
 
     private static CopyOnWriteArraySet<Session> SessionSet ;
-    // 存放取货码，key是收银员编号
+    // 存放小票码，key是收银员编号
     private static Map<String, List<PickUpCodeEntity>> pickUpCodeMap ;
 
     private static List<PickUpCodeEntity> pickUpList ;
@@ -77,7 +77,7 @@ public class WebSocketServer {
         List<PickUpCodeEntity> pickUpCodeEntities = pickUpCodeMap.get(param);
         // TODO
 //        if(pickUpCodeEntities == null){
-            // 查询所有的取货码
+            // 查询所有的小票码
         Map<String,Object> dataParam = new HashMap<>();
         dataParam.put("pickUpCodeCreatetime",new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
         dataParam.put("storeId",param);

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

@@ -221,6 +221,7 @@
         SELECT
         g.goods_name,
         g.number,
+        g.sku,
         g.retail_price,
         r.order_id isPromGoods,
         r.prom_id promId,

kmall-admin/src/main/webapp/WEB-INF/page/pcd/hbk6zzez.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>取货码状态列表</title>
+    <title>小票码状态列表</title>
     #parse("sys/header.html")
 </head>
 <body>

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -279,7 +279,7 @@
 
             </div>
             <div class="col-md-3">
-                <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >取货码 <span v-show="delayResponse"> 海关卡回执导致单量堆积</span></h2><br/>
+                <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >小票码 <span v-show="delayResponse"> 海关卡回执导致单量堆积</span></h2><br/>
                 <div class="row" style="border: white;background-color: #f0f0f0;overflow:auto;height: 700px;">
                     <div class="col-xs-4 col-sm-4" v-for="(item,i) in pickUpCodeList" style="margin-bottom: 8px;">
                         <i-button data-toggle="modal" data-target="#orderDetail" style="width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn,item.pickUpCodeSn)" v-if="item.pickUpCodeStatus == 0"  >&nbsp;{{item.pickUpCodeSn}}</i-button>
@@ -345,7 +345,7 @@
                             <div class="row" style="border:0">
                                 <div class="col-md-3" id="payName">姓名: {{orderEntity.payName}}</div>
                                 <div class="col-md-3" id="mobile">手机号: {{orderEntity.payMobile}}</div>
-                                <div class="col-md-3" id="pickUpCodeSn">取货码: {{orderEntity.pickUpCodeSn}}</div>
+                                <div class="col-md-3" id="pickUpCodeSn">小票码: {{orderEntity.pickUpCodeSn}}</div>
                             </div>
                             <div class="row" style="border:0">
                                 <div class="col-md-12" id="invetoryReceipt">失败原因: {{response}}</div>
@@ -353,6 +353,7 @@
                             <table id="goodsDetailTable" class="table .table-striped" style="margin-top: 50px;">
                                 <tr style="border: white;background-color: orange">
                                     <th>商品名称</th>
+                                    <th>sku</th>
                                     <th>规格</th>
                                     <th>市场价</th>
                                     <th>优惠价</th>
@@ -363,6 +364,7 @@
                                 </tr>
                                 <tr v-for="(item,i) in goodsDetailList" >
                                     <td><h3>{{item.goodsName}}</h3></td>
+                                    <td>{{item.sku}}</td>
                                     <td>{{item.specification}}</td>
                                     <td>{{item.marketPrice}}</td>
                                     <td>{{item.discountedPrice}}</td>

kmall-admin/src/main/webapp/WEB-INF/page/shop/pickupcode.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>取货码信息表</title>
+    <title>小票码信息表</title>
     #parse("sys/header.html")
 </head>
 <body>
@@ -37,20 +37,20 @@
             <Form-item label="订单编号" prop="orderSn">
                 <i-input v-model="pickUpCode.orderSn" placeholder="订单编号"/>
             </Form-item>
-            <Form-item label="取货码" prop="pickUpCode">
-                <i-input v-model="pickUpCode.pickUpCode" placeholder="取货码"/>
+            <Form-item label="小票码" prop="pickUpCode">
+                <i-input v-model="pickUpCode.pickUpCode" placeholder="小票码"/>
             </Form-item>
             <Form-item label="商户订单编号" prop="merchOrderSn">
                 <i-input v-model="pickUpCode.merchOrderSn" placeholder="商户订单编号"/>
             </Form-item>
-            <Form-item label="取货码状态,0:未取,1:已取" prop="pickUpCodeStatus">
-                <i-input v-model="pickUpCode.pickUpCodeStatus" placeholder="取货码状态,0:未取,1:已取"/>
+            <Form-item label="小票码状态,0:未取,1:已取" prop="pickUpCodeStatus">
+                <i-input v-model="pickUpCode.pickUpCodeStatus" placeholder="小票码状态,0:未取,1:已取"/>
             </Form-item>
-            <Form-item label="取货码生成时间" prop="pickUpCodeCreatetime">
-                <i-input v-model="pickUpCode.pickUpCodeCreatetime" placeholder="取货码生成时间"/>
+            <Form-item label="小票码生成时间" prop="pickUpCodeCreatetime">
+                <i-input v-model="pickUpCode.pickUpCodeCreatetime" placeholder="小票码生成时间"/>
             </Form-item>
-            <Form-item label="取货码核销时间" prop="pickUpCodeVerificationtime">
-                <i-input v-model="pickUpCode.pickUpCodeVerificationtime" placeholder="取货码核销时间"/>
+            <Form-item label="小票码核销时间" prop="pickUpCodeVerificationtime">
+                <i-input v-model="pickUpCode.pickUpCodeVerificationtime" placeholder="小票码核销时间"/>
             </Form-item>
             <Form-item label="创建时间" prop="createTime">
                 <i-input v-model="pickUpCode.createTime" placeholder="创建时间"/>

kmall-admin/src/main/webapp/js/sale/pickupcode.js

@@ -347,7 +347,7 @@ function getPrintContentOrder(ticket) {
     content += "会员:" + ticket.ticketHead.memberId;
     content += "</div>";*/
 	content += "<div style=\"width: 100%;font-size: 25px;\">";
-	content += "取货码:" + vm.pickUpCode;
+	content += "小票码:" + vm.pickUpCode;
 	content += "</div>";
 	content += "<div style=\"width: 100%;\">";
 	content += "订单号:" + ticket.ticketHead.orderId;

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1209,7 +1209,7 @@ function getPrintContent(ticket) {
     content += "收银员:" + ticket.userName;
     content += "</div>";
     content += "<div style=\"text-align: center;width: 100%;font-size: 30px;margin:15px 0 10px 5px;\">";
-    content += "取货码" ;
+    content += "小票码" ;
     content += "</div>";
     content += "<div style=\"text-align: center;width: 100%;font-size: 50px;margin:15px 0 10px 5px;\">";
     content += ticket.code;
@@ -1301,9 +1301,9 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         //kmall测试环境
-        webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
-        // webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
+        webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
         //kmall本地环境
         // webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
@@ -1400,7 +1400,7 @@ function getPrintContentOrder(ticket) {
     content += "会员:" + ticket.ticketHead.memberId;
     content += "</div>";*/
     content += "<div style=\"width: 100%;font-size: 25px;\">";
-    content += "取货码:" + vm.pickUpCode;
+    content += "小票码:" + vm.pickUpCode;
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "订单号:" + ticket.ticketHead.orderId;
@@ -1839,7 +1839,7 @@ function toPayOrder(payCode){
                     $(".form-group input[type=text]").each(function(){
                         this.value = '';
                     })
-                    // 打印取货码小票
+                    // 打印小票码小票
                     var content = getPrintContent(r.resultObj);
                     console.log(content);
                     printArea2(content);

kmall-admin/src/main/webapp/js/shop/goodsproduct.js

@@ -312,7 +312,7 @@ let vm = new Vue({
                 data: "{}",
                 success: function (r) {
                     if (r.code === 0) {
-                        alert('操作成功', function (index) {
+                        alert(r.msg, function (index) {
                             vm.reload();
                         });
                     } else {

kmall-admin/src/main/webapp/js/shop/pickupcode.js

@@ -4,11 +4,11 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: '订单编号', name: 'orderSn', index: 'order_sn', key: true, hidden: false},
-			{label: '取货码', name: 'pickUpCodeSn', index: 'pick_up_code_sn', width: 80},
+			{label: '小票码', name: 'pickUpCodeSn', index: 'pick_up_code_sn', width: 80},
 			{label: '商户订单编号', name: 'merchOrderSn', index: 'merch_order_sn', width: 80},
-			{label: '取货码状态,0:未取,1:已取', name: 'pickUpCodeStatus', index: 'pick_up_code_status', width: 80},
-			{label: '取货码生成时间', name: 'pickUpCodeCreatetime', index: 'pick_up_code_createtime', width: 80},
-			{label: '取货码核销时间', name: 'pickUpCodeVerificationtime', index: 'pick_up_code_verificationtime', width: 80},
+			{label: '小票码状态,0:未取,1:已取', name: 'pickUpCodeStatus', index: 'pick_up_code_status', width: 80},
+			{label: '小票码生成时间', name: 'pickUpCodeCreatetime', index: 'pick_up_code_createtime', width: 80},
+			{label: '小票码核销时间', name: 'pickUpCodeVerificationtime', index: 'pick_up_code_verificationtime', width: 80},
 			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
 			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
 			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 80},

kmall-common/src/main/java/com/kmall/common/fileserver/minio/MinIOUtils.java

@@ -43,21 +43,21 @@ public class MinIOUtils {
                     try {
                         String profiles = env.getActiveProfiles()[0];
                         if ("dev".equals(profiles)) {
-                            host = "http://127.0.0.1:9393";
-                            baseApi = "/dev-api";
+                            host = "http://3f352e8584.qicp.vip:9393";
+                            baseApi = "/test-api";
                         } else if ("test".equals(profiles)) {
                             host = "http://3f352e8584.qicp.vip:9393";
                             baseApi = "/test-api";
                         } else if ("prod".equals(profiles)) {
                             host = "http://3f352e8584.qicp.vip:9393";
-                            baseApi = "/prod-api";
+                            baseApi = "/test-api";
                         } else {
                             host = "http://3f352e8584.qicp.vip:9393";
-                            baseApi = "/prod-api";
+                            baseApi = "/test-api";
                         }
                     } catch (Exception e) {
                         host = "http://3f352e8584.qicp.vip:9393";
-                        baseApi = "/prod-api";
+                        baseApi = "/test-api";
                     }
                     inited = true;
                 }