核销

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -683,6 +683,7 @@ public class GicOrderController {
         record.setOrderNo(data.getDefinedCode());
         record.setPayNumber(data.getPayNumber());
         record.setPayTime(data.getPayTime());
+        record.setOrigin(2);
         return orderVerificationRecordApiService.createRecord(record);
     }
 
@@ -696,7 +697,6 @@ public class GicOrderController {
         scanVO.setPayCost(exchangeLogDTO.getPayCost());
         scanVO.setPayNumber(exchangeLogDTO.getPayNumber());
         scanVO.setPayTime(exchangeLogDTO.getPayTime());
-        scanVO.setFinishTime(exchangeLogDTO.getFinishTime());
 
         ProductVO productVO = new ProductVO();
         productVO.setProName(exchangeLogDTO.getProName());
@@ -718,6 +718,7 @@ public class GicOrderController {
         scanVO.setPoint(exchangeLogDTO.getGoodsPoint());
         scanVO.setAddress(exchangeLogDTO.getGoodsAddress());
         scanVO.setTakeTime(exchangeLogDTO.getGoodsTime());
+        scanVO.setCreateTime(exchangeLogDTO.getCreateTime());
         // 兑换状态 -2兑换取消(退货) -1兑换无效 0兑换取消(礼品未付款) 11兑换中(加钱购待支付) 3已发货(礼品) 1兑换功成
         // 2领取(卡券) 4成功
         // 其实只需要 1 2 4
@@ -728,11 +729,11 @@ public class GicOrderController {
             OrderVerificationRecordDTO info = orderVerificationRecordApiService.recordInfo(scanVO.getRecordId());
             if (null != info) {
                 // 说明已经核销了
-                scanVO.setCreateTime(info.getCreateTime());
+                scanVO.setFinishTime(info.getFinishTime());
                 scanVO.setChecked(1);
             }
             if (exchangeLogDTO.getStatus() == IntegralMallExchangeLogStatusEnums.CONFIRM.getStatus()) {
-                scanVO.setCreateTime(exchangeLogDTO.getUpdateTime());
+                scanVO.setFinishTime(exchangeLogDTO.getFinishTime());
                 scanVO.setChecked(1);
             }
         }