收银台问题修复

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

@@ -2816,14 +2816,14 @@ public class OrderServiceImpl implements OrderService {
             Integer beforeScoreInteger = (Integer) param.get("beforeScore");
             Integer afterScoreStrInteger = (Integer) param.get("afterScore");
             int deductionScore = org.springframework.util.StringUtils.isEmpty((String) param.get("deductionScore")) ? 0 : Integer.parseInt((String) param.get("deductionScore"));
-            String memberPhone = String.valueOf(param.get("memberPhone"));
+            String consigneePhone = String.valueOf(param.get("consigneePhone"));
             BigDecimal scoreDeductionPrice = new BigDecimal(org.springframework.util.StringUtils.isEmpty(param.get("scoreDeductionPrice").toString()) ? "0" : param.get("scoreDeductionPrice").toString());
             consumptionRecords.setBeforeScore(beforeScoreInteger);
             consumptionRecords.setAfterScore(afterScoreStrInteger);
             consumptionRecords.setOrderTotalPrice(order.getActual_price());
             consumptionRecords.setScoreDeductionPrice(scoreDeductionPrice);
             consumptionRecords.setMemberCode(memberCode);
-            consumptionRecords.setMemberPhone(memberPhone);
+            consumptionRecords.setMemberPhone(consigneePhone);
             consumptionRecords.setOrderGiftScore(memberScore.get());
             consumptionRecords.setActivityGiftScore(activityGiftScore.get());
             consumptionRecords.setDeductionScore(deductionScore);
@@ -2833,7 +2833,7 @@ public class OrderServiceImpl implements OrderService {
 
             if (!org.springframework.util.StringUtils.isEmpty(memberCode)) {
                 // 同步会员订单消费记录
-                syncMemberConsumeRecord(memberPhone, order, deductionScore);
+                syncMemberConsumeRecord(consigneePhone, order, deductionScore);
                 if (deductionScore > 0) {
                     // 积分变动接口，下单扣减
                     syncMemberScoreChangeRecord(openId, order, deductionScore,null, "下单扣减", queryGoodsVOList, giftGoodsScoreDetailMap, HaiKongMemberScoreChangeEventEnum.SUBTRACT.getEvent());
@@ -3407,7 +3407,7 @@ public class OrderServiceImpl implements OrderService {
         HaiKongMemberOrderSyncResendEntity haiKongMemberOrderSyncResendEntity = new HaiKongMemberOrderSyncResendEntity();
         MemberOrderInfoSyncDTO memberOrderInfoSyncDTO = new MemberOrderInfoSyncDTO();
         memberOrderInfoSyncDTO.setOrderNo(order.getOrder_sn());
-        memberOrderInfoSyncDTO.setOpenId(memberPhone);
+        memberOrderInfoSyncDTO.setOpenId(Objects.isNull(order.getMemberCode()) ? memberPhone : order.getMemberCode());
         memberOrderInfoSyncDTO.setConsumeDate(new Date());
         memberOrderInfoSyncDTO.setOrderAmount(order.getActual_price());
         memberOrderInfoSyncDTO.setOrderScore(deductionScore);
@@ -3489,7 +3489,7 @@ public class OrderServiceImpl implements OrderService {
         memberScoreChangeDTO.setChangeEvent(changeEvent);
         memberScoreChangeDTO.setChangeId(changeId);
         memberScoreChangeDTO.setChangeReason(changeReason);
-        memberScoreChangeDTO.setOpenId(openId);
+        memberScoreChangeDTO.setOpenId(Objects.isNull(order.getMemberCode()) ? openId : order.getMemberCode());
         memberScoreChangeDTO.setOutBizNo(order.getOrder_sn());
         memberScoreChangeDTO.setScore(score);
         if(!Objects.isNull(activityScore)){

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

@@ -423,7 +423,7 @@
                                     </div>
                                     <div class="modal-body">
                                         <div style="margin-bottom: 10PX">
-                                            <h3 style="border: white;padding: 8px">会员手机号：{{userInfo.customPhone}}</h3>
+                                            <h3 style="border: white;padding: 8px">会员手机号：{{userInfo.consigneePhone}}</h3>
                                         </div>
                                         <div style="margin-bottom: 30px">
                                             <ul style="display: inline-block">

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

@@ -2240,6 +2240,7 @@ function toPayOrder(payCode){
                  'cmbArea':cmbArea,
                  'addrUser':addrUser,
                  'status':status,
+                 'consigneePhone':vm.userInfo.consigneePhone,
                 };
     // console.log(JSON.stringify(param));
     vm.parCode = "";