bug修复

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

@@ -530,100 +530,22 @@ public class OrderController {
         return "";
     }
     /**
-     * 订单退款请求
+     * 海控订单退款请求（后台退款）
      */
     @RequiresPermissions(value = {"order:offilineRefund"})
     @RequestMapping(value = "offilineRefund", method = RequestMethod.POST)
     public Object offilineRefund(Long orderId) {
         OrderEntity orderInfo = orderService.queryObject(orderId);
         if (null == orderInfo) {
-            return R.error("订单不存在");
+            return R.error("订单不存在，无法退款");
         }
-        if (orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_401.getItem()) ||
-            orderInfo.getOrderStatus() == Integer.parseInt(Dict.orderStatus.item_402.getItem())) {
-            return R.error("订单已退款");
-        }
-
-        if (orderInfo.getOrderStatus() != Integer.parseInt(Dict.orderStatus.item_0.getItem())) {
-            if (Dict.payFlag.item_cash.getItem().equals(orderInfo.getPayFlag())) {
-                //现金支付，直接修改订单状态
-                orderService.refund(orderInfo);
-            } else if (Dict.payFlag.item_weixin.getItem().equals(orderInfo.getPayFlag())) {
-                //微信线下扫码支付
-                WechatRefundApiResult result = WechatUtil
-                        .wxRefund(orderInfo.getOrderSnWx(), orderInfo.getActualPrice().doubleValue(),
-                                  orderInfo.getActualPrice().doubleValue());
-                if (result.getResult_code().equals(WechatUtil.WXTradeState.SUCCESS.getCode())) {
-                    orderService.refund(orderInfo, result);
-                } else {
-                    OrderRefundEntity mallOrderRefund = orderRefundService.queryObjectByOrderId(orderInfo.getId());
-                    OrderRefundEntity orderRefund = new OrderRefundEntity();
-                    orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));
-                    orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
-                    orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
-//                    orderRefund.setOutRefundNo(result.getOut_refund_no());
-                    SysUserEntity user = ShiroUtils.getUserEntity();
-                    orderRefund.setModerSn(user.getUsername());
-                    orderRefund.setModTime(new Date());
-                    if (mallOrderRefund != null) {
-                        orderRefund.setId(mallOrderRefund.getId());
-                        orderRefundService.update(orderRefund);//退款记录
-                    }
-
-                    OrderExceptionRecordEntity mallOrderExceptionRecord = new OrderExceptionRecordEntity();
-                    mallOrderExceptionRecord.setUserId(Integer.parseInt(orderInfo.getUserId() + ""));
-                    mallOrderExceptionRecord.setOrderSn(orderInfo.getOrderSn());
-                    mallOrderExceptionRecord.setExceptionStatus(Dict.exceptionStatus.item_03.getItem());
-                    mallOrderExceptionRecord.setExceptionContent("退款失败" + result.getErr_code_des());
-                    mallOrderExceptionRecord.setCreateTime(new Date());
-                    orderExceptionRecordService.save(mallOrderExceptionRecord);
-
-                    return R.error(result.getErr_code_des());
-                }
-            }else if(Dict.payFlag.item_alipay.getItem().equals(orderInfo.getPayFlag())){
-                // 支付宝线下扫码支付
-                AliPayMicropayApiResult result = null;
-                try {
-                    result = AliPayUtil.aliTradeRefund(orderInfo.getOrderSn(),orderInfo.getActualPrice()+"",
-                            "顾客退款",orderInfo.getStoreId().toString());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-                if (result.getCode().equals(AliPayUtil.AliPayTradeState.SUCC.getCode())) {
-                    orderService.refund(orderInfo, result);
-                } else {
-                    OrderRefundEntity mallOrderRefund = orderRefundService.queryObjectByOrderId(orderInfo.getId());
-                    OrderRefundEntity orderRefund = new OrderRefundEntity();
-                    orderRefund.setRefundType(Integer.parseInt(Dict.RefundType.item_1.getItem()));
-                    orderRefund.setRefundMoney(BigDecimal.valueOf(orderInfo.getActualPrice().doubleValue()));
-                    orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_4.getItem()));
-//                    orderRefund.setOutRefundNo(result.getOut_refund_no());
-                    SysUserEntity user = ShiroUtils.getUserEntity();
-                    orderRefund.setModerSn(user.getUsername());
-                    orderRefund.setModTime(new Date());
-                    if (mallOrderRefund != null) {
-                        orderRefund.setId(mallOrderRefund.getId());
-                        orderRefundService.update(orderRefund);//退款记录
-                    }
-
-                    OrderExceptionRecordEntity mallOrderExceptionRecord = new OrderExceptionRecordEntity();
-                    mallOrderExceptionRecord.setUserId(Integer.parseInt(orderInfo.getUserId() + ""));
-                    mallOrderExceptionRecord.setOrderSn(orderInfo.getOrderSn());
-                    mallOrderExceptionRecord.setExceptionStatus(Dict.exceptionStatus.item_03.getItem());
-                    mallOrderExceptionRecord.setExceptionContent("退款失败" + result.getSubMsg());
-                    mallOrderExceptionRecord.setCreateTime(new Date());
-                    orderExceptionRecordService.save(mallOrderExceptionRecord);
-
-                    return R.error(result.getSubMsg());
-                }
-            } else{
-                return R.ok("退款成功");
-            }
-
+        try {
+            return orderService.orderRefund(orderInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("[offilineRefund-----海控后台退款异常]"+orderInfo.getOrderSn(),e);
+            return R.error(500,"退款失败");
         }
-
-        return R.ok("退款成功");
     }
 
     /**
@@ -1086,12 +1008,10 @@ public class OrderController {
     @RequestMapping("/orderHkRefund")
     public R orderRefund( @RequestBody Map param) {
 
-        SysUserEntity user = ShiroUtils.getUserEntity();
         Integer orderId = (Integer) param.get("orderId");
         OrderEntity orderInfo = orderService.queryObject(orderId.longValue());
-        String sessionId = (String) param.get("sessionId");
         try {
-            return orderService.orderRefund(orderInfo,sessionId,user);
+            return orderService.orderRefund(orderInfo);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("[orderHkRefund-----海控退款异常]"+orderInfo.getOrderSn(),e);

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

@@ -45,7 +45,7 @@ public class OrderProcessRecordExternalController {
      * @return
      */
     @PostMapping("/hkNotice")
-    public Message hknoticeMsg(@RequestBody OutRequestMessage outRequestMessage) {
+    public Message hknoticeMsg(@RequestBody OutRequestMessage outRequestMessage){
         try{
             OrderProcessRecordHkEntity orderProcessRecordHkEntity  = JacksonUtil.fromStringJson(outRequestMessage.getData(), OrderProcessRecordHkEntity.class);
             //签名验证

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

@@ -104,7 +104,7 @@ public class SysOssController {
      * 上传文件
      */
     @RequestMapping("/upload")
-    @RequiresPermissions("sys:oss:all")
+//    @RequiresPermissions("sys:oss:all")
     public R upload(@RequestParam("file") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
             throw new RRException("上传文件不能为空");

kmall-admin/src/main/java/com/kmall/admin/dao/vip/Mall2PointsRulesDao.java

@@ -4,6 +4,7 @@ import com.kmall.admin.dto.Mall2RulesDto;
 import com.kmall.admin.entity.vip.Mall2DetilEntity;
 import com.kmall.admin.entity.vip.Mall2PointsRulesEntity;
 import com.kmall.admin.haikong.vo.PointsRulesAndDetailVO;
+import com.kmall.common.utils.Query;
 import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,7 +34,7 @@ public interface Mall2PointsRulesDao extends BaseDao<Mall2PointsRulesEntity> {
 
     void saveMall2PointsRulesDetil(List<Mall2RulesDto> pointsRulesList);
 
-    List<Mall2RulesDto> querymall2PointsRulesDetil(Long id);
+    List<Mall2RulesDto> querymall2PointsRulesDetil(Query query);
 
     int querymall2PointsRulesDetilTotal(Long id);
 

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

@@ -1,5 +1,6 @@
 package com.kmall.admin.dto;
 
+import com.mysql.cj.Query;
 import lombok.Data;
 
 @Data

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

@@ -161,7 +161,7 @@ public interface OrderService {
 
     OrderEntity queryObjectByOrderSn(String orderSn);
 
-    R orderRefund(OrderEntity orderInfo, String sessionId, SysUserEntity user) throws Exception;
+    R orderRefund(OrderEntity orderInfo) throws Exception;
 
     int queryOffilineOrderTotal(Query query);
 

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

@@ -1165,16 +1165,7 @@ public class GoodsServiceImpl implements GoodsService {
                 // 数据库里面查询
                 BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
                 if (queryBrand == null) {
-                    BrandEntity brandEntity = new BrandEntity();
-                    brandEntity.setName(brandName);
-                    brandEntity.setUniqueIdentifier(uniqueIdentifier);
-                    brandEntity.setSimpleDesc(brandName);
-                    brandEntity.setIsShow(1);
-                    brandEntity.setIsNew(0);
-                    brandService.save(brandEntity);
-                    brandCacheData.put("brandId", brandEntity.getId() + "");
-                    brandCacheData.put("brandName", brandName);
-                    goodsEntity.setBrandId(brandEntity.getId());
+                    throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
                 } else {
                     brandCacheData.put("brandId", queryBrand.getId() + "");
                     brandCacheData.put("brandName", queryBrand.getName());

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

@@ -3376,7 +3376,7 @@ public class OrderServiceImpl implements OrderService {
     // 收银端退款的代码
     @Override
     @Transactional
-    public synchronized R orderRefund(OrderEntity order, String sessionId, SysUserEntity user) throws Exception {
+    public synchronized R orderRefund(OrderEntity order) throws Exception {
         OrderEntity orderInfo = order;
         if (null == orderInfo) {
             return R.error("订单不存在");
@@ -3433,7 +3433,7 @@ public class OrderServiceImpl implements OrderService {
                 pickUpCodeService.update(pickUpCodeEntity);
                 //新增退款记录
                 //OrderRefundEntity orderRefund = orderRefundLog("wx453456511","wx453456566","26999",order.getId(),user.getUserId(),order.getMerchOrderSn());
-                OrderRefundEntity orderRefund = orderRefundLog(result.getRefund_id(),result.getOut_trade_no(),result.getRefund_fee(),order.getId(),user.getUserId(),order.getMerchOrderSn());
+                OrderRefundEntity orderRefund = orderRefundLog(result.getRefund_id(),result.getOut_trade_no(),result.getRefund_fee(),order.getId(),order.getMerchOrderSn(),payFlag);
                 orderRefundDao.save(orderRefund);
                 //还原库存，调用免税mall接口退款和积分回退接口
                 restoreInventoryMsMall(order);
@@ -3462,12 +3462,11 @@ public class OrderServiceImpl implements OrderService {
             pickUpCodeEntity.setPickUpCodeStatus(Dict.PickUpCodeStatusEnum.item_3.getStatus());
             pickUpCodeService.update(pickUpCodeEntity);
             //新增退款记录
-            OrderRefundEntity orderRefund = orderRefundLog(userRefund.getTradeNo(),userRefund.getOutTradeNo(),userRefund.getRefundFee(),order.getId(),user.getUserId(),order.getMerchOrderSn());
+            OrderRefundEntity orderRefund = orderRefundLog(userRefund.getTradeNo(),userRefund.getOutTradeNo(),userRefund.getRefundFee(),order.getId(),order.getMerchOrderSn(),payFlag);
             orderRefundDao.save(orderRefund);
             //还原库存，调用免税mall接口退款和积分回退接口
             restoreInventoryMsMall(order);
         }
-        //int ss = 1/0;
         return R.ok("退款成功");
     }
 
@@ -3478,21 +3477,28 @@ public class OrderServiceImpl implements OrderService {
      * @param OutTradeNo
      * @param refundFee
      * @param orderId
-     * @param userId
      * @param merchOrderSn
      * @return
      */
-    private OrderRefundEntity orderRefundLog(String refundId,String OutTradeNo,String refundFee,Long orderId,Long userId,String merchOrderSn){
+    private OrderRefundEntity orderRefundLog(String refundId,String OutTradeNo,String refundFee,Long orderId,String merchOrderSn,String payFlag){
+
         OrderRefundEntity orderRefund = new OrderRefundEntity();
         orderRefund.setRefundId(refundId);
         orderRefund.setOutRefundNo(OutTradeNo);
-        orderRefund.setRefundMoney(BigDecimal.valueOf(Long.valueOf(refundFee)).divide(Constant.ONE_HUNDRED));
+        if(Dict.payFlag.item_weixin.getItem().equals(payFlag)){
+            orderRefund.setRefundMoney(BigDecimal.valueOf(Long.valueOf(refundFee)).divide(Constant.ONE_HUNDRED));
+        }else{
+            orderRefund.setRefundMoney(new BigDecimal(refundFee));
+        }
         orderRefund.setRefundStatus(Integer.parseInt(Dict.RefundStatus.item_2.getItem()));//退款处理中
         orderRefund.setModTime(new Date());
         orderRefund.setRefundTime(new Date());
         orderRefund.setOrderId(orderId.intValue());
-        orderRefund.setUserId(userId.intValue());
-        orderRefund.setRefundId(userId + "");
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user!=null){
+            orderRefund.setUserId(user.getUserId().intValue());
+            orderRefund.setRefundId(user.getUserId() + "");
+        }
         orderRefund.setCreateTime(new Date());
         Integer sum = orderDao.queryObjectByMerchOrderSnHkMall(merchOrderSn);
         if (sum > 1) {//多条订单

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

@@ -2,14 +2,11 @@ package com.kmall.admin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.kmall.admin.dao.*;
 import com.kmall.admin.dao.mk.dist.MkDistSellAllocationDao;
-import com.kmall.admin.dto.GoodsDto;
 import com.kmall.admin.dto.StoreGoodsDto;
 import com.kmall.admin.entity.*;
-import com.kmall.admin.entity.kmall2eccs.KtoEccsEntity;
 import com.kmall.admin.entity.mk.dist.MkDistSellAllocationEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.BrandService;
@@ -1010,16 +1007,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                 // 数据库里面查询
                 BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
                 if (queryBrand == null) {
-                    BrandEntity brandEntity = new BrandEntity();
-                    brandEntity.setName(brandName);
-                    brandEntity.setUniqueIdentifier(uniqueIdentifier);
-                    brandEntity.setSimpleDesc(brandName);
-                    brandEntity.setIsShow(1);
-                    brandEntity.setIsNew(0);
-                    brandService.save(brandEntity);
-                    brandCacheData.put("brandId", brandEntity.getId() + "");
-                    brandCacheData.put("brandName", brandName);
-                    storeRelaEntity.setBrandId(brandEntity.getId());
+                    throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
                 } else {
                     brandCacheData.put("brandId", queryBrand.getId() + "");
                     brandCacheData.put("brandName", queryBrand.getName());
@@ -1034,16 +1022,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             // 数据库里面查询
             BrandEntity queryBrand = brandService.queryByUniqueIdentifier(uniqueIdentifier);
             if (queryBrand == null) {
-                BrandEntity brandEntity = new BrandEntity();
-                brandEntity.setName(brandName);
-                brandEntity.setUniqueIdentifier(uniqueIdentifier);
-                brandEntity.setSimpleDesc(brandName);
-                brandEntity.setIsShow(1);
-                brandEntity.setIsNew(0);
-                brandService.save(brandEntity);
-                brandCacheData.put("brandId", brandEntity.getId() + "");
-                brandCacheData.put("brandName", brandName);
-                storeRelaEntity.setBrandId(brandEntity.getId());
+                throw new RuntimeException("该品牌不存在，请检查品牌唯一标识符是否正确:"+uniqueIdentifier);
             } else {
                 brandCacheData.put("brandId", queryBrand.getId() + "");
                 brandCacheData.put("brandName", queryBrand.getName());

kmall-admin/src/main/java/com/kmall/admin/service/impl/vip/Mall2PointsRulesServiceImpl.java

@@ -126,8 +126,8 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
      */
     @Override
     public List<Mall2RulesDto> queryDetilList(Query query) {
-        Long id = Long.parseLong(query.get("mkaId")+"");
-        List<Mall2RulesDto> mall2DetilEntities = mall2PointsRulesDao.querymall2PointsRulesDetil(id);
+        //Long id = Long.parseLong(query.get("mkaId")+"");
+        List<Mall2RulesDto> mall2DetilEntities = mall2PointsRulesDao.querymall2PointsRulesDetil(query);
         return mall2DetilEntities;
 
     }

kmall-admin/src/main/java/com/kmall/admin/task/TestTask.java

@@ -16,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -56,4 +57,11 @@ public class TestTask {
     }
 
 
+    public static void main(String[] args) {
+        String s = "5.00";
+        BigDecimal bigDecimal = new BigDecimal(s);
+        System.out.println(bigDecimal);
+    }
+
+
 }

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2PointsRulesDao.xml

@@ -180,7 +180,7 @@
 
 	</insert>
 
-	<select id="querymall2PointsRulesDetil" parameterType="java.lang.Long" resultType="com.kmall.admin.dto.Mall2RulesDto">
+	<select id="querymall2PointsRulesDetil" resultType="com.kmall.admin.dto.Mall2RulesDto">
 		select
 		     id,
              father_id as mkaId,
@@ -189,7 +189,7 @@
 			 points_store_name as storeName
 		from mall2_points_rules_detil
 		WHERE
-		father_id = #{id}
+		father_id = #{mkaId}
 		<if test="offset != null and limit != null">
 			limit #{offset}, #{limit}
 		</if>

kmall-admin/src/main/resources/spring/spring-shiro.xml

@@ -67,6 +67,7 @@
         <property name="filterChainDefinitions">
             <value>
                 /orderProRecordExternal/**=anon
+                /sys/oss/**=anon
                 /goods/number/**=anon
                 /statics/**=anon
                 /api/**=anon

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

@@ -38,40 +38,40 @@
 	    <div id="jqGridPager"></div>
     </Card>
 
-    <Card v-show="!showList">
-        <p slot="title">{{title}}</p>
-		<i-form ref="formValidate" :model="mkActivitiesHalfPrice" :rules="ruleValidate" :label-width="80">
-<!--            <Form-item label="积分规则类型" prop="productName">-->
-<!--                <i-input v-model="mkActivitiesHalfPrice.productName" placeholder="产品中文名"/>-->
+<!--    <Card v-show="!showList">-->
+<!--        <p slot="title">{{title}}</p>-->
+<!--		<i-form ref="formValidate" :model="mkActivitiesHalfPrice" :rules="ruleValidate" :label-width="80">-->
+<!--&lt;!&ndash;            <Form-item label="积分规则类型" prop="productName">&ndash;&gt;-->
+<!--&lt;!&ndash;                <i-input v-model="mkActivitiesHalfPrice.productName" placeholder="产品中文名"/>&ndash;&gt;-->
+<!--&lt;!&ndash;            </Form-item>&ndash;&gt;-->
+<!--            <Form-item label="商品条码" prop="goodsSn">-->
+<!--                <i-select v-model="mall2PointsRules.pointsType" placeholder="商品条码" label-in-value>-->
+<!--                    <i-option v-for="category in categories" :value="category.value"-->
+<!--                              :key="category.value">{{category.name}}-->
+<!--                    </i-option>-->
+<!--                </i-select>-->
 <!--            </Form-item>-->
-            <Form-item label="商品条码" prop="goodsSn">
-                <i-select v-model="mall2PointsRules.pointsType" placeholder="商品条码" label-in-value>
-                    <i-option v-for="category in categories" :value="category.value"
-                              :key="category.value">{{category.name}}
-                    </i-option>
-                </i-select>
-            </Form-item>
-            <Form-item label="门店名称" prop="goodsSn">
-                <i-select v-model="mall2PointsRules.pointsType" placeholder="门店名称" label-in-value>
-                    <i-option v-for="category in categories2" :value="category.value"
-                              :key="category.value">{{category.name}}
-                    </i-option>
-                </i-select>
-            </Form-item>
-            <Form-item label="商品类别" prop="goodsSn">
-                <i-select v-model="mall2PointsRules.pointsType" placeholder="商品类别" label-in-value>
-                    <i-option v-for="category in categories3" :value="category.value"
-                              :key="category.value">{{category.name}}
-                    </i-option>
-                </i-select>
-            </Form-item>
-            <Form-item>
-                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
-                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
-                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
-            </Form-item>
-        </i-form>
-	</Card>
+<!--            <Form-item label="门店名称" prop="goodsSn">-->
+<!--                <i-select v-model="mall2PointsRules.pointsType" placeholder="门店名称" label-in-value>-->
+<!--                    <i-option v-for="category in categories2" :value="category.value"-->
+<!--                              :key="category.value">{{category.name}}-->
+<!--                    </i-option>-->
+<!--                </i-select>-->
+<!--            </Form-item>-->
+<!--            <Form-item label="商品类别" prop="goodsSn">-->
+<!--                <i-select v-model="mall2PointsRules.pointsType" placeholder="商品类别" label-in-value>-->
+<!--                    <i-option v-for="category in categories3" :value="category.value"-->
+<!--                              :key="category.value">{{category.name}}-->
+<!--                    </i-option>-->
+<!--                </i-select>-->
+<!--            </Form-item>-->
+<!--            <Form-item>-->
+<!--                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>-->
+<!--                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>-->
+<!--                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>-->
+<!--            </Form-item>-->
+<!--        </i-form>-->
+<!--	</Card>-->
 </div>
 
 <script src="${rc.contextPath}/js/mk/mall2RulesDetil.js?_${date.systemTime}"></script>

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

@@ -1472,19 +1472,19 @@ function openWebSocket() {
         };
         //收到消息事件
         webSocket.onmessage = function (msg) {
-            // var data = Object.assign({}, JSON.parse(msg.data));
-            // console.log('3.接收到服务端信息......data:'+data);
-            // vm.sessionId = data.sessionId;
-            // vm.pickUpCodeList = [];
-            // if(data.pickUpCodeList.length > 0){
-            //     for(var i = 0 ; i < data.pickUpCodeList.length ; i++){
-            //         // console.log(data.pickUpCodeList[i].storeId);
-            //         if(data.pickUpCodeList[i].storeId === storeId){
-            //             vm.pickUpCodeList.push(data.pickUpCodeList[i]);
-            //         }
-            //     }
-            // }
-            // vm.delayResponse = data.delayResponse;
+            var data = Object.assign({}, JSON.parse(msg.data));
+            console.log('3.接收到服务端信息......data:'+data);
+            vm.sessionId = data.sessionId;
+            vm.pickUpCodeList = [];
+            if(data.pickUpCodeList.length > 0){
+                for(var i = 0 ; i < data.pickUpCodeList.length ; i++){
+                    // console.log(data.pickUpCodeList[i].storeId);
+                    if(data.pickUpCodeList[i].storeId === storeId){
+                        vm.pickUpCodeList.push(data.pickUpCodeList[i]);
+                    }
+                }
+            }
+            vm.delayResponse = data.delayResponse;
         };
         //连接关闭事件
         webSocket.onclose = function () {

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

@@ -443,12 +443,14 @@ let vm = new Vue({
                     url: '../order/offilineRefund',
                     data: params,
                     success: function (r) {
-                        if (r.code === 0) {
-                            alert('退款成功', function (index) {
-                                vm.reload();
-                            });
+                        if (r.code == 0) {
+                            vm.canRefund = true;
+                            alert("退款成功")
+                        } else if (r.code == 500) {
+                            vm.canRefund = true;
+                            alert(r.msg)
                         } else {
-                            alert(r.msg);
+                            alert("退款失败，请联系管理员");
                         }
                     }
                 });

kmall-manager/src/main/resources/conf/db.properties

@@ -1,9 +1,9 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
 ####========== \u5F00\u53D1\u73AF\u5883 ==========
-jdbc.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-jdbc.username=root
-jdbc.password=G$Debpk^pn
+#jdbc.url=jdbc:mysql://14.29.226.8:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#jdbc.username=root
+#jdbc.password=G$Debpk^pn
 ####========== \u6D4B\u8BD5\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://192.168.1.202:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #jdbc.username=root
@@ -13,6 +13,10 @@ jdbc.password=G$Debpk^pn
 #jdbc.url=jdbc:mysql://:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #jdbc.username=kmall_cw
 #jdbc.password=eb6zHJg%x3
+#\u672C\u5730\u6D4B\u8BD5\u5E93
+jdbc.url=jdbc:mysql://192.168.1.202:3306/kmall-haikong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+jdbc.username=root
+jdbc.password=t2GlpD6z
 
 
 # \u901A\u7528\u914D\u7F6E

kmall-manager/src/main/resources/conf/wx-global.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.global.env = prod
+pay.wx.global.env = dev
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========

kmall-manager/src/main/resources/conf/wx-mp.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.env=prod
+pay.wx.env=dev
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========