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

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

@@ -547,7 +547,12 @@ public class GoodsController {
         }
 
 
-        Map<String,Object> map = goodsService.calculateGoodsDetail(prodBarcode,storeId);
+        Map<String,Object> map = null;
+        try {
+            map = goodsService.calculateGoodsDetail(prodBarcode,storeId);
+        } catch (Exception e) {
+            return R.error("系统异常，请联系管理员！e:"+e.getMessage());
+        }
         if(map == null){
             return R.error("商品信息不存在");
         }

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

@@ -38,8 +38,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 /**

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

@@ -1145,7 +1145,7 @@ public class GoodsServiceImpl implements GoodsService {
         String goodsRate = goods.getGoodsRate();
         BigDecimal tax = goods.getRetailPrice().multiply(new BigDecimal(goodsRate)).setScale(2, RoundingMode.HALF_UP);
         goods.setGoodstaxes(tax.toString());
-        goods.setActualPaymentAmount(goods.getRetailPrice().add(tax).setScale(2,RoundingMode.HALF_UP));
+        goods.setActualPaymentAmount(goods.getRetailPrice().setScale(2,RoundingMode.HALF_UP));
 
         Map<String,Object> skuActivitiesMap = new HashMap<>();
 

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

@@ -1780,21 +1780,8 @@ public class OrderServiceImpl implements OrderService {
                     }
 
 
-                    if(goodsDto.get("actualPaymentAmount") instanceof Double){
-                        goodsEntity.setStoreRetailPrice(new BigDecimal((Double)goodsDto.get("actualPaymentAmount")));
-
-                    }else if(goodsDto.get("actualPaymentAmount") instanceof Integer){
-                        goodsEntity.setStoreRetailPrice(new BigDecimal((Integer)goodsDto.get("actualPaymentAmount")));
-
-
-
-                    }else if(goodsDto.get("actualPaymentAmount") instanceof Float){
-                        goodsEntity.setStoreRetailPrice(new BigDecimal((Float)goodsDto.get("actualPaymentAmount")));
-
 
 
-                    }
-
                     if(goodsDto.get("retailPrice") instanceof Double){
                     goodsEntity.setRetailPrice(new BigDecimal((Double)goodsDto.get("retailPrice"))); // 单价
 
@@ -1819,14 +1806,25 @@ public class OrderServiceImpl implements OrderService {
                     }
 
 
-                    if(goodsDto.get("goodstaxes") instanceof Double){
-                       totalTax =  totalTax.add(new BigDecimal((Double)goodsDto.get("goodstaxes"))); // 实际支付价格
-                    }else if(goodsDto.get("goodstaxes") instanceof Integer){
-                       totalTax = totalTax.add(new BigDecimal((Integer)goodsDto.get("goodstaxes")));
-                    }else if(goodsDto.get("goodstaxes") instanceof Float){
-                        totalTax = totalTax.add(new BigDecimal((Float)goodsDto.get("goodstaxes")));
-                    }else if(goodsDto.get("goodstaxes") instanceof String){
-                        totalTax = totalTax.add(new BigDecimal((String) goodsDto.get("goodstaxes")));
+                    Object taxObject = goodsDto.get("goodstaxes");
+                    BigDecimal tax = new BigDecimal(0);
+                    if(taxObject instanceof Double){
+                       tax = new BigDecimal((Double) taxObject);
+                    }else if(taxObject instanceof Integer){
+                        tax = new BigDecimal((Integer) taxObject);
+                    }else if(taxObject instanceof Float){
+                        tax = new BigDecimal((Float) taxObject);
+                    }else if(taxObject instanceof String){
+                        tax = new BigDecimal((String) taxObject) ;
+                    }
+                    totalTax = totalTax.add(tax); // 计算总的税额
+
+                    if(goodsDto.get("actualPaymentAmount") instanceof Double){
+                        goodsEntity.setStoreRetailPrice(new BigDecimal((Double)goodsDto.get("actualPaymentAmount")));
+                    }else if(goodsDto.get("actualPaymentAmount") instanceof Integer){
+                        goodsEntity.setStoreRetailPrice(new BigDecimal((Integer)goodsDto.get("actualPaymentAmount")));
+                    }else if(goodsDto.get("actualPaymentAmount") instanceof Float){
+                        goodsEntity.setStoreRetailPrice(new BigDecimal((Float)goodsDto.get("actualPaymentAmount")));
                     }
 
 
@@ -1947,7 +1945,7 @@ public class OrderServiceImpl implements OrderService {
             // 微信支付
 //            wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
             // 支付宝支付
-//            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
+            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
             OrderEntity orderEntity = queryObject(order.getId());
 //            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
 //            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
@@ -2319,7 +2317,7 @@ public class OrderServiceImpl implements OrderService {
             order.setPayStatus(Integer.parseInt(Dict.payStatus.item_4.getItem()));
         }else{
 
-            AliPayMicropayApiResult userRefund = AliPayUtil.aliTradeRefund(order.getMerchOrderSn(), "38.81",
+            AliPayMicropayApiResult userRefund = AliPayUtil.aliTradeRefund(order.getOrderSn(), order.getActualPrice().toString(),
                     "用户退款", order.getStoreId() + "");
 
             LOGGER.info(userRefund.getSubMsg());
@@ -2420,8 +2418,7 @@ public class OrderServiceImpl implements OrderService {
         fullCutCouponDec = fullCutCouponDec.add(couponPrice).setScale(2,RoundingMode.HALF_UP);
 
         // 加上税额
-        goodsTotalPrice = goodsTotalPrice.add(totalTax).setScale(2,RoundingMode.HALF_UP);
-        orderTotalPrice = orderTotalPrice.add(totalTax).setScale(2,RoundingMode.HALF_UP);
+        goodsTotalPrice = goodsTotalPrice.subtract(totalTax).setScale(2,RoundingMode.HALF_UP);
 
 
 
@@ -2459,9 +2456,9 @@ public class OrderServiceImpl implements OrderService {
         //留言
         orderInfo.setPostscript("无");
         orderInfo.setAdd_time(new Date());
-        orderInfo.setGoods_price(goodsTotalPrice);
+        orderInfo.setGoods_price(goodsTotalPrice); // 商品总价
         orderInfo.setOrder_price(orderTotalPrice);
-        orderInfo.setActual_price(actualPrice);
+        orderInfo.setActual_price(actualPrice); // 实际支付金额
         orderInfo.setOrder_type("1");
         orderInfo.setOrder_status(0);
         orderInfo.setShipping_status(0);
@@ -2514,7 +2511,7 @@ public class OrderServiceImpl implements OrderService {
         BigDecimal goodsTotal = goodsDto.getStoreRetailPrice().multiply(number);//单商品总价
         BigDecimal rate = goodsTotal.divide(orderInfo.getGoods_price(),2, BigDecimal.ROUND_HALF_UP);//当前商品总价/订单总价（不含运费、不含优惠券）
         BigDecimal freightPrice = BigDecimal.valueOf(orderInfo.getFreight_price());
-        BigDecimal settlePrice = Constant.ZERO;
+        BigDecimal settlePrice = Constant.ZERO;  // ccnet 取的这个而价格
         if(orderInfo.getFreight_price() != 0 && !"0".equalsIgnoreCase(orderInfo.getCoupon_price()+"")){
             //运费-优惠券
             BigDecimal rateTotal = freightPrice.subtract(orderInfo.getCoupon_price());

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

@@ -236,6 +236,8 @@
         LEFT JOIN mall_goods_specification r ON r.goods_id = a.id
         left join mall_product_store_rela m on m.goods_id = a.id and r.goods_id = m.goods_id
         where a.prod_barcode = #{prodBarcode} and m.store_id = #{storeId}
+        and m.stock_num > 0
+        limit 1
     </select>
 
 

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

@@ -301,7 +301,7 @@
                         </div>
                         <div class="modal-footer">
                             <button type="button" class="btn btn-primary" @click="verification" id="verification" data-dismiss="modal">核销</button>
-                            <button type="button" class="btn btn-primary" @click="refundOrder" id="refundOrder" data-dismiss="modal">退款</button>
+                            <button type="button" class="btn btn-primary" @click="refundOrder()" id="refundOrder" data-dismiss="modal">退款</button>
                             <!--<button type="button" class="btn btn-primary" @click="retrySendOrder" id="retrySendOrder" data-dismiss="modal">订单重推</button>-->
                         </div>
                     </div>

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

@@ -734,7 +734,7 @@ let vm = new Vue({
                     type: "POST",
                     url: "../order/orderRefund",
                     contentType: "application/json",
-                    data: JSON.stringify({'orderId':9000,'sessionId':vm.sessionId}),
+                    data: JSON.stringify({'id':vm.currentOrderNo,'sessionId':vm.sessionId}),
                     success: function (r) {
                         if (r.code == 0) {
                             alert("退款成功")
@@ -899,8 +899,8 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
-        webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
-        // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
+        // webSocket = new WebSocket("ws://127.0.0.1:8080//ws/server/"+storeId);
+        webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');
         }