抖音团购支付

src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -193,6 +193,10 @@ public class Constants {
      * 代金券
      */
     public static final String DJZ = "K";
+    /**
+     * 抖音团购
+     */
+    public static final String DY_TG = "L";
     /**
      * 优惠活动
      */

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -409,6 +409,16 @@ public class MzChargeDetailController {
                 resultMap.put("message", "缴费失败,用户Token不存在");
                 return resultMap;
             }
+            for(MzDepositFile mzDepositFile : mzDepositFileVo.getMzDepositFiles()){
+                if(Constants.DY_TG.equals(mzDepositFile.getChequeType())){
+                    if(StrUtil.isBlank(mzDepositFile.getDyTgNo())){
+                        resultMap.put("code", -1);
+                        resultMap.put("message", "付费方式为抖音团购,必须输入抖音团购码");
+                        return resultMap;
+                    }
+                    mzDepositFile.setContractId(Convert.toLong(mzDepositFile.getDyTgNo()));
+                }
+            }
             DecodedJWT decodedJWT = TokenUtil.parseJWT(token);
             User tokenUser = (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class);
             List<MzReceiptSerial> mzReceiptSerials = mzReceiptSerialService.queryTallyReceiptSerialByIdAndTimes(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), mzDepositFileVo.getReceiptNo());

src/main/java/cn/hnthyy/thmz/controller/mz/MzyReqrecController.java

@@ -646,7 +646,7 @@ public class MzyReqrecController {
                         return resultMap;
                     }
                 }
-                if (!(YesNoEnum.YES.code.equals(mzyReqrec.getRefundType()) &&Arrays.asList(Constants.BYJZ, Constants.YLK, Constants.JHZF,Constants.DJZ,Constants.YH_HD,Constants.GCP).contains(dbMzyReqrec.getPaymode()))) {
+                if (!(YesNoEnum.YES.code.equals(mzyReqrec.getRefundType()) &&Arrays.asList(Constants.BYJZ, Constants.YLK, Constants.JHZF,Constants.DJZ,Constants.YH_HD,Constants.GCP,Constants.DY_TG).contains(dbMzyReqrec.getPaymode()))) {
                     dbMzyReqrec.setPaymode(Constants.CASH);
                 }
                 ZdChequeType zdChequeType = zdChequeTypeService.queryChequeTypeByCode(dbMzyReqrec.getPaymode());

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzDepositFile.java

@@ -54,7 +54,7 @@ public class MzDepositFile extends PageBean implements Serializable {
     private String hisrefundnum;
     //金额字符串
     private String amountStr;
-    //合同id
+    //合同id 借用 抖音团购号
     private Long contractId;
     //付款方式名称
     private String chequeTypeName;
@@ -64,6 +64,8 @@ public class MzDepositFile extends PageBean implements Serializable {
     private String transDate;
     //凭证号
     private String traceNo;
+    //抖音团购号
+    private String dyTgNo;
     public MzDepositFile() {
     }
     public MzDepositFile(String patientId, Integer times) {

src/main/java/cn/hnthyy/thmz/entity/thmz/ReceiptSerialFee.java

@@ -21,6 +21,8 @@ public class ReceiptSerialFee {
     private BigDecimal yhhdjzje;
     //GCP记账金额
     private BigDecimal gcpjzje;
+    //抖音团购
+    private BigDecimal dytgjzje;
     //银联卡的金额
     private BigDecimal ylkje;
     //聚合支付的金额

src/main/java/cn/hnthyy/thmz/mapper/his/mz/ChargeFeeVoMapper.java

@@ -337,6 +337,10 @@ public interface ChargeFeeVoMapper {
                     "        when cheque_type ='K' then amount  " +
                     "        else 0  " +
                     "    end ) djjssk,"+
+                    "sum ( case  " +
+                    "        when cheque_type ='L' then amount  " +
+                    "        else 0  " +
+                    "    end ) dytgssk,"+
                     "sum ( amount) zjss," +
                     "sum ( case when pay_mark  <![CDATA[<>]]>'0'  then amount else 0 end ) zjtk," +
                     "sum ( case when ((cheque_type='W' or cheque_type='E' or cheque_type='Y') and op_id ='99999') then amount else 0 end ) wxzzss," +
@@ -346,6 +350,7 @@ public interface ChargeFeeVoMapper {
                     "count ( distinct case when cheque_type ='H' and pay_mark ='0' then receipt_sn else null end ) yhhdhs," +
                     "count ( distinct case when cheque_type ='I' and pay_mark ='0' then receipt_sn else null end ) gcphs," +
                     "count ( distinct case when cheque_type ='K' and pay_mark ='0' then receipt_sn else null end ) djjh," +
+                    "count ( distinct case when cheque_type ='L' and pay_mark ='0' then receipt_sn else null end ) dytgh," +
                     "count ( distinct case when cheque_type ='1' and pay_mark ='0' then receipt_sn else null end ) xjbs," +
                     "count ( distinct case when ( cheque_type ='5' or cheque_type ='3' ) and pay_mark ='0' then receipt_sn else null end ) yhsbs," +
                     "count ( distinct case when cheque_type ='6' and pay_mark ='0' then receipt_sn else null end ) sybbs," +
@@ -364,6 +369,7 @@ public interface ChargeFeeVoMapper {
                     "count ( distinct case when cheque_type ='H' and pay_mark = '1' then receipt_sn else null end ) yhhdth," +
                     "count ( distinct case when cheque_type ='I' and pay_mark = '1' then receipt_sn else null end ) gcphth," +
                     "count ( distinct case when cheque_type ='K' and pay_mark = '1' then receipt_sn else null end ) djjth," +
+                    "count ( distinct case when cheque_type ='L' and pay_mark = '1' then receipt_sn else null end ) dytgth," +
                     "   count ( distinct case when cheque_type = 'Y' and op_id <![CDATA[<>]]> '99999' and pay_mark &gt; '0'  then receipt_sn else null end ) zftfbs," +
                     "   count ( distinct case when (cheque_type ='2' or cheque_type ='8' or cheque_type ='9')  and pay_mark &gt; '0'  then receipt_sn else null end ) ybjztfbs," +
                     "count ( distinct case when pay_mark  <![CDATA[<>]]> '0' then cast(serial_no as char)+cheque_type else null end ) ztfbs," +
@@ -393,6 +399,8 @@ public interface ChargeFeeVoMapper {
                     "sum ( case when cheque_type ='K' and pay_mark ='1' then amount else 0 end ) djjtk," +
                     "sum ( case when cheque_type ='K' and pay_mark ='0' then amount else 0 end ) djjsk," +
                     "sum ( case when cheque_type ='1' and pay_mark ='0'  then amount else 0 end ) xjsk," +
+                    "sum ( case when cheque_type ='L' and pay_mark ='1' then amount else 0 end ) dytgtk," +
+                    "sum ( case when cheque_type ='L' and pay_mark ='0'  then amount else 0 end ) dytgsk," +
                     "sum ( case when cheque_type in ('5' ,'3') and pay_mark ='0' then amount else 0 end ) yhksk," +
                     "sum ( case when cheque_type='6' and pay_mark ='0' then amount else 0 end ) sybksk," +
                     "sum ( case when cheque_type = 'Y' and op_id <![CDATA[<>]]> '99999' and pay_mark ='0' then amount else 0 end ) zfsk," +

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzZyReqMapper.java

@@ -36,9 +36,9 @@ public interface MzZyReqMapper {
      * @param mzZyReq
      * @return
      */
-    @Update("update mz_zy_req set confirm_id=#{confirmId},confirm_date=#{confirmDate},zy_serial_no=#{zySerialNo},req_status=#{reqStatus} where patient_id =#{patientId} and req_status=0")
+    @Update("update mz_zy_req set confirm_id=#{confirmId},confirm_date=#{confirmDate},zy_serial_no=#{zySerialNo},req_status=#{reqStatus} where patient_id =#{patientId} and req_status='0' ")
     int updateMzZyReq(MzZyReq mzZyReq);
-    @Update("update mz_zy_req set confirm_id=#{confirmId},confirm_date=#{confirmDate},req_status=#{reqStatus} where patient_id =#{patientId} and req_status=3")
+    @Update("update mz_zy_req set confirm_id=#{confirmId},confirm_date=#{confirmDate},req_status=#{reqStatus} where patient_id =#{patientId} and req_status='3' ")
     int updateMzZyReqStatus(MzZyReq mzZyReq);
 
     /**

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -50,6 +50,7 @@ import cn.hnthyy.thmz.vo.MzPrescriptionVo;
 import cn.hnthyy.thmz.vo.TcMzPrescriptionVo;
 import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.DynaBean;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.thread.ThreadUtil;
@@ -1006,8 +1007,18 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             jzdjMzReceiptSerial.setChequeType(Constants.GCP);
             mzReceiptSerialMapper.insertMzReceiptSerial(jzdjMzReceiptSerial);
         }
-
-
+        //抖音团购
+        if (receiptSerialFee.getDytgjzje() != null && receiptSerialFee.getDytgjzje().compareTo(BigDecimal.ZERO) == 1) {
+            MzReceiptSerial jzdjMzReceiptSerial = CloneUtil.clone(mzReceiptSerial);
+            //当前联合支付方式中，没有自付金额，则不清空发票明细
+            if (receiptSerialFee.getZfTotalPayable().compareTo(BigDecimal.ZERO) == 1) {
+                //resetParams(jzMzReceiptSerial);
+                jzdjMzReceiptSerial.resetParams();
+            }
+            jzdjMzReceiptSerial.setTotalCharge(receiptSerialFee.getDytgjzje());
+            jzdjMzReceiptSerial.setChequeType(Constants.DY_TG);
+            mzReceiptSerialMapper.insertMzReceiptSerial(jzdjMzReceiptSerial);
+        }
         //聚合支付金额
         if (receiptSerialFee.getJhzfje() != null && receiptSerialFee.getJhzfje().compareTo(BigDecimal.ZERO) == 1) {
             MzReceiptSerial jhzfMzReceiptSerial = CloneUtil.clone(mzReceiptSerial);
@@ -4752,6 +4763,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         BigDecimal yhhdAmount = BigDecimal.ZERO;
         //GCP
         BigDecimal gcpAmount = BigDecimal.ZERO;
+        //抖音团购
+        BigDecimal dytgAmount = BigDecimal.ZERO;
         MzDepositFile temp = null;
         Map<String, Object> returnMap = new HashMap<>();
         //需要调用银行接口退费的集合
@@ -4776,6 +4789,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 yhhdAmount = yhhdAmount.add(ms.getAmount());
             } else if (Constants.GCP.equals(ms.getChequeType())) {
                 gcpAmount = gcpAmount.add(ms.getAmount());
+            }else if (Constants.DY_TG.equals(ms.getChequeType())) {
+                dytgAmount = dytgAmount.add(ms.getAmount());
             }
 
             else if (YesNoEnum.YES.code.equals(mzDepositFileVo.getRefundType()) && (Constants.YLK.equals(ms.getChequeType()) || Constants.JHZF.equals(ms.getChequeType()) )) {
@@ -4888,6 +4903,14 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             fullNewMzDepositFiles.add(gcpTemp);
             relationMap.put(gcpTemp.getChequeType(), gcpTemp);
         }
+        if (dytgAmount.compareTo(BigDecimal.ZERO) == 1) {
+            //复制一个抖音团购的的退款记录
+            MzDepositFile dytgTemp = CloneUtil.clone(temp);
+            dytgTemp.setChequeType(Constants.DY_TG);
+            dytgTemp.setAmount(BigDecimal.ZERO.subtract(dytgAmount));
+            fullNewMzDepositFiles.add(dytgTemp);
+            relationMap.put(dytgTemp.getChequeType(), dytgTemp);
+        }
 
         //如果有非本院记账的退款金额，非本院记账记录保持入库
         if (notByjzAmount.compareTo(BigDecimal.ZERO) == 1) {
@@ -4958,6 +4981,17 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     setRefundData(refundMzDepositFiles, m, Constants.GCP, gcpAmount.add(tempTotalFee));
                 }
             }
+            //抖音团购
+            if(dytgAmount.compareTo(BigDecimal.ZERO) == 1 && dytgAmount.compareTo(BigDecimal.ZERO) > 0){
+                tempTotalFee = tempTotalFee.subtract(dytgAmount);
+                if(tempTotalFee.compareTo(BigDecimal.ZERO) >=0){
+                    addNewDepositFile(fullNewMzDepositFiles,newMzDepositFiles,m,dytgAmount,Constants.DY_TG);
+                }else {
+                    addNewDepositFile(fullNewMzDepositFiles,newMzDepositFiles,m,dytgAmount.add(tempTotalFee),Constants.DY_TG);
+                    removeByChequeType(refundMzDepositFiles,Constants.DY_TG);
+                    setRefundData(refundMzDepositFiles, m, Constants.DY_TG, dytgAmount.add(tempTotalFee));
+                }
+            }
             //部分退费添加医保报销收费方式
             if(ybFlag && tempTotalFee.compareTo(BigDecimal.ZERO) > 0){
                 List<MzDepositFile> ybMzDepositFile = getMzChargeDetailService().getYbMzDepositFile(m,mzDepositFileVo);
@@ -5768,6 +5802,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         BigDecimal yhhdjzje = BigDecimal.ZERO;
         //GCP的金额
         BigDecimal gcpjzje = BigDecimal.ZERO;
+        //抖音团购金额
+        BigDecimal dytgjzje = BigDecimal.ZERO;
         //银联卡的金额
         BigDecimal ylkje = BigDecimal.ZERO;
         //聚合支付的金额
@@ -5823,6 +5859,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 yhhdjzje = yhhdjzje.add(m.getAmount());
             } else if (Constants.GCP.equals(m.getChequeType())) {
                 gcpjzje = gcpjzje.add(m.getAmount());
+            }else if (Constants.DY_TG.equals(m.getChequeType())) {
+                dytgjzje = dytgjzje.add(m.getAmount());
             }
             else if (setPosAmont && Constants.JHZF.equals(m.getChequeType())) {
                 jhzfje = jhzfje.add(m.getAmount());
@@ -5841,6 +5879,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         receiptSerialFee.setDjqjzje(djqjzje.setScale(2, BigDecimal.ROUND_FLOOR));
         receiptSerialFee.setYhhdjzje(yhhdjzje.setScale(2, BigDecimal.ROUND_FLOOR));
         receiptSerialFee.setGcpjzje(gcpjzje.setScale(2, BigDecimal.ROUND_FLOOR));
+        receiptSerialFee.setDytgjzje(dytgjzje.setScale(2, BigDecimal.ROUND_FLOOR));
         receiptSerialFee.setJhzfje(jhzfje.setScale(2, BigDecimal.ROUND_FLOOR));
         receiptSerialFee.setYlkje(ylkje.setScale(2, BigDecimal.ROUND_FLOOR));
         receiptSerialFee.setZfTotalPayable(zfTotalPayable.setScale(2, BigDecimal.ROUND_FLOOR));

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hnthyy.thmz.entity.his.mz.MzDepositFile;
 import cn.hnthyy.thmz.entity.his.mz.MzPatientMi;
 import cn.hnthyy.thmz.entity.his.mz.MzReceiptSerial;
 import cn.hnthyy.thmz.entity.his.mz.MzVisitTable;
+import cn.hnthyy.thmz.entity.his.zd.ZdChequeType;
 import cn.hnthyy.thmz.entity.thmz.Clinic;
 import cn.hnthyy.thmz.entity.thmz.Receipt;
 import cn.hnthyy.thmz.entity.thmz.User;
@@ -30,6 +31,7 @@ import cn.hnthyy.thmz.service.thmz.UserService;
 import cn.hnthyy.thmz.vo.HeadInfo;
 import cn.hnthyy.thmz.vo.MzReceiptSerialVo;
 import cn.hnthyy.thmz.vo.UseReceioVo;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -41,6 +43,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -51,6 +54,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
@@ -85,6 +89,8 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
     private UserService userService;
     @Autowired
     private YpMzFytjMapper ypMzFytjMapper;
+    @Resource
+    private ZdChequeTypeService zdChequeTypeService;
     @Override
     public List<MzReceiptSerial> queryTallyReceiptSerial(String patientId) {
         return mzReceiptSerialMapper.selectTallyReceiptSerial(patientId);
@@ -168,6 +174,9 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         if (receipt == null || StringUtils.isBlank(receipt.getReceiptCurrent())) {
             throw new MzException("用户id=" + user.getUserName() + "没有可用的门诊发票,请先维护发票。");
         }
+        List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeType();
+        Map<String, Integer> printFlagMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getPrintFlag));
+        Map<String, String> nameMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
         MzReceiptSerial returnMzReceiptSerial=null;
         for (MzReceiptSerial mzReceiptSerial:mzReceiptSerials){
             if(Constants.HLWYY_CODE.equals(mzReceiptSerial.getOperatorId())){
@@ -176,9 +185,9 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
             if(StringUtils.isBlank(mzReceiptSerial.getChequeType())){
                 throw new MzException("当前病人发票表中的收费类型为空，无法打印发票，请及时联系管理员！");
             }
-            if(Arrays.asList(Constants.YBJZ,Constants.BYJZ,Constants.DJZ,Constants.GCP,Constants.YH_HD).contains(mzReceiptSerial.getChequeType())){
-                String type = Constants.YBJZ.equals(mzReceiptSerial.getChequeType())?"本院记账":"医保记账";
-                throw new MzException(type+"发票无法打印发票，请及时联系管理员");
+            Integer printFlag = printFlagMap.get(mzReceiptSerial.getChequeType());
+            if(Convert.toInt(printFlag,0) == 0){
+                throw new MzException(nameMap+"发票无法打印发票，请及时联系管理员");
             }
             if(returnMzReceiptSerial==null){
                 returnMzReceiptSerial=mzReceiptSerial;

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -732,7 +732,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             dbMzyReqrec.setOpId(opId);
             dbMzyReqrec.setDcountNo(YesNoEnum.NO.code);
             dbMzyReqrec.setClosingDate(null);
-            if (!(Arrays.asList(Constants.BRZZJF_CODE, Constants.HLWYY_CODE).contains(opId) || (YesNoEnum.YES.code.equals(mzyReqrec.getRefundType()) && Arrays.asList(Constants.BYJZ, Constants.YLK, Constants.JHZF,Constants.YH_HD,Constants.GCP,Constants.DJZ).contains(dbMzyReqrec.getPaymode())))) {
+            if (!(Arrays.asList(Constants.BRZZJF_CODE, Constants.HLWYY_CODE).contains(opId) || (YesNoEnum.YES.code.equals(mzyReqrec.getRefundType()) && Arrays.asList(Constants.BYJZ, Constants.YLK, Constants.JHZF,Constants.YH_HD,Constants.GCP,Constants.DJZ,Constants.DY_TG).contains(dbMzyReqrec.getPaymode())))) {
                 dbMzyReqrec.setPaymode(Constants.CASH);
             }
             if(thMzyReqrec == null){

src/main/java/cn/hnthyy/thmz/vo/ChargeCountVo.java

@@ -204,6 +204,22 @@ public class ChargeCountVo {
     private BigDecimal djjssk;
 
 
+    //抖音团购笔数
+    private Integer dytgh;
+    //抖音团收款金额
+    private BigDecimal dytgsk;
+
+    //抖音团退款笔数
+    private Integer dytgth;
+    //抖音团退款金额
+    private BigDecimal dytgtk;
+
+    //抖音团实收笔数
+    private Integer dytgssh;
+    //抖音团实收金额
+    private BigDecimal dytgssk;
+
+
     //实缴合计
     private BigDecimal sjhj;
     //总计
@@ -290,6 +306,27 @@ public class ChargeCountVo {
             djjssk=BigDecimal.ZERO;
         }
 
+        if(dytgh == null){
+            dytgh = 0;
+        }
+        if(dytgth==null){
+            dytgth=0;
+        }
+
+        dytgssh =  dytgh - dytgth;
+
+        if(dytgsk==null){
+            dytgsk=BigDecimal.ZERO;
+        }
+
+        if(dytgtk==null){
+            dytgtk=BigDecimal.ZERO;
+        }
+
+        if(dytgssk==null){
+            dytgssk=BigDecimal.ZERO;
+        }
+
 
         if(ybjzbs==null){
             ybjzbs=0;

src/main/resources/static/js/mz/daily.js

@@ -104,7 +104,7 @@ function extractedSf (res,flag) {
         $("#djjsk").html(res.chargeCountVo.djjsk.toFixed(2));
     }
     $("#djjth").html(res.chargeCountVo.djjth);
-    if (res.chargeCountVo.gcptk != null) {
+    if (res.chargeCountVo.djjtk != null) {
         $("#djjtk").html(res.chargeCountVo.djjtk.toFixed(2));
     }
     $("#djjssh").html(res.chargeCountVo.djjssh);
@@ -112,6 +112,20 @@ function extractedSf (res,flag) {
         $("#djjssk").html(res.chargeCountVo.djjssk.toFixed(2));
     }
 
+    //抖音团购
+    $("#dytgh").html(res.chargeCountVo.dytgh);
+    if (res.chargeCountVo.dytgsk != null) {
+        $("#dytgsk").html(res.chargeCountVo.dytgsk.toFixed(2));
+    }
+    $("#dytgth").html(res.chargeCountVo.dytgth);
+    if (res.chargeCountVo.dytgtk != null) {
+        $("#dytgtk").html(res.chargeCountVo.dytgtk.toFixed(2));
+    }
+    $("#dytgssh").html(res.chargeCountVo.dytgssh);
+    if (res.chargeCountVo.dytgssk != null) {
+        $("#dytgssk").html(res.chargeCountVo.dytgssk.toFixed(2));
+    }
+
 
     //银行卡收款
     $("#yhsbs").html(res.chargeCountVo.yhsbs);

src/main/resources/static/js/mz/daily_collect.js

@@ -115,14 +115,26 @@ function extractedSf (res) {
         $("#djjsk").html(res.chargeCountVo.djjsk.toFixed(2));
     }
     $("#djjth").html(res.chargeCountVo.djjth);
-    if (res.chargeCountVo.gcptk != null) {
+    if (res.chargeCountVo.djjtk != null) {
         $("#djjtk").html(res.chargeCountVo.djjtk.toFixed(2));
     }
     $("#djjssh").html(res.chargeCountVo.djjssh);
     if (res.chargeCountVo.djjssk != null) {
         $("#djjssk").html(res.chargeCountVo.djjssk.toFixed(2));
     }
-
+    //抖音团购
+    $("#dytgh").html(res.chargeCountVo.dytgh);
+    if (res.chargeCountVo.dytgsk != null) {
+        $("#dytgsk").html(res.chargeCountVo.dytgsk.toFixed(2));
+    }
+    $("#dytgth").html(res.chargeCountVo.dytgth);
+    if (res.chargeCountVo.dytgtk != null) {
+        $("#dytgtk").html(res.chargeCountVo.dytgtk.toFixed(2));
+    }
+    $("#dytgssh").html(res.chargeCountVo.dytgssh);
+    if (res.chargeCountVo.dytgssk != null) {
+        $("#dytgssk").html(res.chargeCountVo.dytgssk.toFixed(2));
+    }
 
 
     //银行卡收款

src/main/resources/static/js/mz/daily_repeat_print.js

@@ -122,7 +122,7 @@ function extractedSf (res,flag) {
         $("#djjsk").html(res.chargeCountVo.djjsk.toFixed(2));
     }
     $("#djjth").html(res.chargeCountVo.djjth);
-    if (res.chargeCountVo.gcptk != null) {
+    if (res.chargeCountVo.djjtk != null) {
         $("#djjtk").html(res.chargeCountVo.djjtk.toFixed(2));
     }
     $("#djjssh").html(res.chargeCountVo.djjssh);
@@ -130,6 +130,19 @@ function extractedSf (res,flag) {
         $("#djjssk").html(res.chargeCountVo.djjssk.toFixed(2));
     }
 
+    //抖音团购
+    $("#dytgh").html(res.chargeCountVo.dytgh);
+    if (res.chargeCountVo.dytgsk != null) {
+        $("#dytgsk").html(res.chargeCountVo.dytgsk.toFixed(2));
+    }
+    $("#dytgth").html(res.chargeCountVo.dytgth);
+    if (res.chargeCountVo.dytgtk != null) {
+        $("#dytgtk").html(res.chargeCountVo.dytgtk.toFixed(2));
+    }
+    $("#dytgssh").html(res.chargeCountVo.dytgssh);
+    if (res.chargeCountVo.dytgssk != null) {
+        $("#dytgssk").html(res.chargeCountVo.dytgssk.toFixed(2));
+    }
 
 
     //银行卡收款

src/main/resources/static/js/mz/toll_administration.js

@@ -1628,6 +1628,7 @@ function saveConfirmFee() {
         return;
     }
     var project = $("#project").val();
+    let dyTgId = $("#dyTgId").val();
     var jsonData = JSON.parse('{"patientId":"","times":"","receiptNo":"","mzDepositFiles":[]}');
     var patientId = $("#patientIdHaveTally").val();
     var times = $("#timesHaveTally").val();
@@ -1642,7 +1643,7 @@ function saveConfirmFee() {
             if (temp == null || temp == 0) {
                 continue;
             }
-            var tempJson = JSON.parse('{"chequeType":"","amount":"","contractId":"","psordnum":"","agtordnum":"","parChannel":"","transDate":"","traceNo":""}');
+            var tempJson = JSON.parse('{"chequeType":"","amount":"","contractId":"","psordnum":"","agtordnum":"","parChannel":"","transDate":"","traceNo":"","dyTgNo":""}');
             tempJson.chequeType = $(arr[i]).find("select").val();
             tempJson.psordnum = $(arr[i]).find("input.refNo").val();
             tempJson.agtordnum = $(arr[i]).find("input.qrCodeParam").val();
@@ -1657,6 +1658,9 @@ function saveConfirmFee() {
             if (project != null && project != "null" && project != "") {
                 tempJson.contractId = project;
             }
+            if(stringNotBlank(dyTgId)){
+                tempJson.dyTgNo = dyTgId;
+            }
             tempJson.amount = temp;
             jsonData.mzDepositFiles[jsonData.mzDepositFiles.length] = tempJson;
         }

src/main/resources/templates/mz/daily.html

@@ -182,6 +182,15 @@
                             <td id="djjssh">0</td>
                             <td id="djjssk">0.00</td>
                         </tr>
+                        <tr>
+                            <td class="text-center">抖音团购</td>
+                            <td id="dytgh">0</td>
+                            <td id="dytgsk">0.00</td>
+                            <td id="dytgth">0</td>
+                            <td id="dytgtk">0.00</td>
+                            <td id="dytgssh">0</td>
+                            <td id="dytgssk">0.00</td>
+                        </tr>
                         <tr>
                             <td class="text-center">银行卡</td>
                             <td id="yhsbs">0</td>

src/main/resources/templates/mz/daily_collect.html

@@ -194,6 +194,15 @@
                             <td id="djjssh">0</td>
                             <td id="djjssk">0.00</td>
                         </tr>
+                        <tr>
+                            <td class="text-center">抖音团购</td>
+                            <td id="dytgh">0</td>
+                            <td id="dytgsk">0.00</td>
+                            <td id="dytgth">0</td>
+                            <td id="dytgtk">0.00</td>
+                            <td id="dytgssh">0</td>
+                            <td id="dytgssk">0.00</td>
+                        </tr>
                         <tr>
                             <td class="text-center">银行卡</td>
                             <td id="yhsbs">0</td>

src/main/resources/templates/mz/daily_repeat_print.html

@@ -208,6 +208,15 @@
                             <td id="djjssh">0</td>
                             <td id="djjssk">0.00</td>
                         </tr>
+                        <tr>
+                            <td class="text-center">抖音团购</td>
+                            <td id="dytgh">0</td>
+                            <td id="dytgsk">0.00</td>
+                            <td id="dytgth">0</td>
+                            <td id="dytgtk">0.00</td>
+                            <td id="dytgssh">0</td>
+                            <td id="dytgssk">0.00</td>
+                        </tr>
                         <tr>
                             <td class="text-center">银行卡</td>
                             <td id="yhsbs">0</td>

src/main/resources/templates/mz/toll_administration.html

@@ -237,6 +237,16 @@
                             <div class="col-md-1 col-sm-1 col-xs-12" style="line-height: 34px;">元</div>
                         </div>
                     </div>
+                    <div class="item form-group" id="dyTgDiv">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <div class="col-md-2 col-sm-2 col-xs-12"></div>
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12" for="project">抖音团购码：
+                            </label>
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <input class="form-control col-md-5 col-xs-12" id="dyTgId" type="number"/>
+                            </div>
+                        </div>
+                    </div>
                     <div class="item form-group" id="projectDiv">
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-2 col-sm-2 col-xs-12"></div>