Merge branch 'master' of http://git.ds-bay.com/lhm/kmall-haikong

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

@@ -2998,7 +2998,7 @@ public class OrderServiceImpl implements OrderService {
         orderInfoItemDTO.setItemcode(orderGoodsVo.getSku());
         orderInfoItemDTO.setAmount(orderGoodsVo.getActualPaymentAmount());
         Integer number = orderGoodsVo.getNumber();
-        orderInfoItemDTO.setBuyPrice(orderGoodsVo.getActualPaymentAmount().divide(BigDecimal.valueOf(number)).setScale(2, BigDecimal.ROUND_HALF_UP));
+        orderInfoItemDTO.setBuyPrice(orderGoodsVo.getActualPaymentAmount().divide(BigDecimal.valueOf(number), 2, BigDecimal.ROUND_HALF_UP));
         orderInfoItemDTO.setNums(number);
         orderInfoItemDTO.setTax("true");
         orderInfoItemDTO.setTaxPrice(orderGoodsVo.getTaxPrice());
@@ -3467,10 +3467,14 @@ public class OrderServiceImpl implements OrderService {
                     order.setPayTransactionId(result.getTransaction_id());
                     orderDao.updateOrderProcessRecord(processParam);
 
+
+
                     sendWxPayInfo(order, store, result.getTransaction_id());
                     HaiKongSendOrderInfoRecordEntity haiKongSendOrderInfoRecordEntity = new HaiKongSendOrderInfoRecordEntity();
                     haiKongSendOrderInfoRecordEntity.setOutTradeNo(result.getTransaction_id());
+                    haiKongSendOrderInfoRecordEntity.setResponse(JacksonUtil.toJson(result));
                     haiKongSendOrderInfoRecordEntity.setOuterOrderNo(order.getOrder_sn());
+
                     haiKongSendOrderInfoRecordService.updateByOrderSn(haiKongSendOrderInfoRecordEntity);
 
 //                    orderWXPayRecordService