Merge branch 'feature/支付单重推和bug修复1213' of qng/kmall-haikong into master

bug修复

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

@@ -975,7 +975,7 @@ public class GoodsServiceImpl implements GoodsService {
                     //新增、修改商品表
                     if(goods!=null) {// 修改商品
                         mngChangeEntity.setOriginalNum(goods.getGoodsNumber());//原库存数
-                        mngChangeEntity.setValidNum(goods.getGoodsNumber() + Integer.parseInt(goodsDto.getGoodsNumber()));//可用数
+                        mngChangeEntity.setValidNum(Integer.parseInt(goodsDto.getGoodsNumber()));//可用数
                         mngChangeEntity.setChangeNum(Integer.parseInt(goodsDto.getGoodsNumber()));//变化数
                         mngChangeEntity.setChangeType(Dict.changeType.item_3.getItem());
                         mngChangeEntity.setGoodsId(goods.getId().intValue());
@@ -1076,9 +1076,6 @@ public class GoodsServiceImpl implements GoodsService {
                         goodsSpecificationDao.updateBatch(goodsSpecificationEntities);
                     }
                 }
-//                else{
-//                    goodsSpecificationDao.updateBatch(updateSpecificationList);
-//                }
             }
 
 

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

@@ -3421,8 +3421,8 @@ public class OrderServiceImpl implements OrderService {
             }
             if (orderInfo.getOrderStatus() != Integer.parseInt(Dict.orderStatus.item_0.getItem())) {
                 LOGGER.info("[微信退款开始--------orderRefund]"+order.getOrderSn());
-//                WechatRefundApiResult result = WechatUtil.wxRefund(orderInfo.getOrderSn(), totalActualPrice,
-//                        orderInfo.getActualPrice().doubleValue());
+                WechatRefundApiResult result = WechatUtil.wxRefund(orderInfo.getOrderSn(), totalActualPrice,
+                        orderInfo.getActualPrice().doubleValue());
                 order.setPayStatus(Integer.parseInt(Dict.payStatus.item_5.getItem()));
                 order.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_401.getItem()));
                 //修改为退款成功
@@ -3432,8 +3432,8 @@ public class OrderServiceImpl implements OrderService {
                 pickUpCodeEntity.setPickUpCodeStatus(Dict.PickUpCodeStatusEnum.item_3.getStatus());
                 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("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());
                 orderRefundDao.save(orderRefund);
                 //还原库存，调用免税mall接口退款和积分回退接口
                 restoreInventoryMsMall(order);